chz-telegram-bot 0.0.51 → 0.0.52

package/dist/index.d.ts

@@ -1,8 +1,10 @@
 export { startBot, stopBots } from './main';
 export { CommandActionBuilder } from './helpers/builders/commandActionBuilder';
 export { CommandActionBuilderWithState } from './helpers/builders/commandActionBuilder';
-export * from './helpers/builders/scheduledActionBuilder';
 export { IStorageClient } from './types/storage';
+export { ILogger } from './types/logger';
+export { IScheduler } from './types/scheduler';
+export * from './helpers/builders/scheduledActionBuilder';
 export * from './types/actionState';
 export * from './entities/states/actionStateBase';
 export { Hours, Milliseconds, Seconds } from './types/timeValues';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,cAAc,2CAA2C,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/main.d.ts

@@ -4,6 +4,8 @@ import { ScheduledAction } from './entities/actions/scheduledAction';
 import { IActionState } from './types/actionState';
 import { BotInstance } from './entities/botInstance';
 import { Seconds } from './types/timeValues';
+import { IScheduler } from './types/scheduler';
+import { ILogger } from './types/logger';
 /**
  * Starts bot
  */
@@ -18,14 +20,20 @@ declare function startBot(options: {
     scheduled: ScheduledAction<IActionState>[];
     /** Object containing chat name and chat id pairs. Used for logging and execution of scheduled action. */
     chats: Record<string, number>;
-    /** Storage client for bot state storage. If not provided, default `JsonFileStorage` will be used. */
-    storageClient?: IStorageClient;
     /** Storage path for default `JsonFileStorage` client. Will be used only if `storageClient` is not provided. If not provided, default value of `./storage/` will be used.*/
     storagePath?: string;
     /** Period of time between execution of scheduled actions. */
     scheduledPeriod?: Seconds;
     /** If true, telegram API objects will be logged instead of message content. */
     verboseLoggingForIncomingMessage?: boolean;
+    services?: {
+        /** Storage client for bot state storage. If not provided, default `JsonFileStorage` will be used. */
+        storageClient?: IStorageClient;
+        /** Logger client for bot logging. If not provided, default `JsonFileStorage` will be used. */
+        logger?: ILogger;
+        /** Scheduler client for bot scheduling. If not provided, default `NodeTimeoutScheduler` will be used. */
+        scheduler?: IScheduler;
+    };
 }): Promise<BotInstance>;
 /**
  * Terminates all scheduled tasks, closes storage connections and stops all bots.

package/dist/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAQ7C;;GAEG;AACH,iBAAe,QAAQ,CAAC,OAAO,EAAE;IAC7B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,2HAA2H;IAC3H,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;IACxC,mGAAmG;IACnG,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3C,yGAAyG;IACzG,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,qGAAqG;IACrG,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,2KAA2K;IAC3K,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,gCAAgC,CAAC,EAAE,OAAO,CAAC;CAC9C,wBAiBA;AAED;;GAEG;AACH,iBAAe,QAAQ,CAAC,MAAM,EAAE,MAAM,iBASrC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAIzC;;GAEG;AACH,iBAAe,QAAQ,CAAC,OAAO,EAAE;IAC7B,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,2HAA2H;IAC3H,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;IACxC,mGAAmG;IACnG,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3C,yGAAyG;IACzG,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,2KAA2K;IAC3K,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,QAAQ,CAAC,EAAE;QACP,qGAAqG;QACrG,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,8FAA8F;QAC9F,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,yGAAyG;QACzG,SAAS,CAAC,EAAE,UAAU,CAAC;KAC1B,CAAC;CACL,wBAqBA;AAED;;GAEG;AACH,iBAAe,QAAQ,CAAC,MAAM,EAAE,MAAM,iBAIrC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC"}

package/dist/main.js

@@ -3,13 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.startBot = startBot;
 exports.stopBots = stopBots;
 const promises_1 = require("fs/promises");
-const logger_1 = require("./services/logger");
-const taskScheduler_1 = require("./services/taskScheduler");
 const botInstance_1 = require("./entities/botInstance");
 const bots = [];
-function log(text) {
-    logger_1.Logger.logWithTraceId('ALL BOTS', 'System:Bot', 'System', text);
-}
 /**
  * Starts bot
  */
@@ -21,10 +16,14 @@ async function startBot(options) {
         commands: options.commands,
         scheduled: options.scheduled,
         chats: options.chats,
-        storageClient: options.storageClient,
         storagePath: options.storagePath,
         scheduledPeriod: options.scheduledPeriod,
-        verboseLoggingForIncomingMessage: options.verboseLoggingForIncomingMessage
+        verboseLoggingForIncomingMessage: options.verboseLoggingForIncomingMessage,
+        services: {
+            storageClient: options.services?.storageClient,
+            logger: options.services?.logger,
+            scheduler: options.services?.scheduler
+        }
     });
     bots.push(bot);
     return bot;
@@ -33,10 +32,6 @@ async function startBot(options) {
  * Terminates all scheduled tasks, closes storage connections and stops all bots.
  */
 async function stopBots(reason) {
-    log(`Recieved termination code: ${reason}`);
-    taskScheduler_1.Scheduler.stopAll();
-    log('Acquiring storage semaphore...');
-    log('Stopping bots...');
     for (const bot of bots) {
         await bot.stop(reason);
     }

package/dist/services/jsonFileStorage.d.ts

@@ -1,5 +1,4 @@
 import { IStorageClient } from '../types/storage';
-import { ActionExecutionResult } from '../dtos/actionExecutionResult';
 import { IActionState } from '../types/actionState';
 import { IActionWithState, ActionKey } from '../types/actionWithState';
 export declare class JsonFileStorage implements IStorageClient {
@@ -15,7 +14,7 @@ export declare class JsonFileStorage implements IStorageClient {
     load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
     saveMetadata(actions: IActionWithState<IActionState>[], botName: string): Promise<void>;
     getActionState<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number): Promise<TActionState>;
-    saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, transactionResult: ActionExecutionResult<TActionState>): Promise<void>;
+    saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, state: TActionState): Promise<void>;
     close(): Promise<void>;
     updateStateFor<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEvE,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;YAgBJ,YAAY;YAqBZ,IAAI;IAgBlB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,SAAS;IAMtD,YAAY,CACd,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM;IAWb,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM;IAYZ,yBAAyB,CAAC,YAAY,SAAS,YAAY,EAC7D,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAYpD,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":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEvE,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;YAgBJ,YAAY;YAqBZ,IAAI;IAgBlB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,SAAS;IAMtD,YAAY,CACd,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM;IAWb,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM;IAYZ,yBAAyB,CAAC,YAAY,SAAS,YAAY,EAC7D,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY;IAWjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;CAcrD"}

package/dist/services/jsonFileStorage.js

@@ -76,13 +76,11 @@ class JsonFileStorage {
             return Object.assign(action.stateConstructor(), data[chatId]);
         });
     }
-    async saveActionExecutionResult(action, chatId, transactionResult) {
+    async saveActionExecutionResult(action, chatId, state) {
         await this.lock(action.key, async () => {
             const data = await this.loadInternal(action.key);
-            if (transactionResult.shouldUpdate) {
-                data[chatId] = transactionResult.data;
-                await this.save(data, action.key);
-            }
+            data[chatId] = state;
+            await this.save(data, action.key);
         });
     }
     async close() {

package/dist/services/jsonLogger.d.ts

@@ -0,0 +1,8 @@
+import { ILogger } from '../types/logger';
+export declare class JsonLogger implements ILogger {
+    private serializeError;
+    logObjectWithTraceId(botName: string, traceId: string | number, chatName: string, data: any): void;
+    logWithTraceId(botName: string, traceId: string | number, chatName: string, text: string): void;
+    errorWithTraceId<TData>(botName: string, traceId: string | number, chatName: string, errorObj: unknown, extraData?: TData | undefined): void;
+}
+//# sourceMappingURL=jsonLogger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,qBAAa,UAAW,YAAW,OAAO;IAEtC,OAAO,CAAC,cAAc;IAQtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG;IAQb,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"}

package/dist/services/jsonLogger.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonLogger = void 0;
+class JsonLogger {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    serializeError(error) {
+        const plainObject = {};
+        Object.getOwnPropertyNames(error).forEach(function (key) {
+            plainObject[key] = error[key];
+        });
+        return JSON.stringify(plainObject);
+    }
+    logObjectWithTraceId(botName, traceId, chatName, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data) {
+        data.botName = botName;
+        data.traceId = traceId;
+        data.chatName = chatName;
+        console.log(data);
+    }
+    logWithTraceId(botName, traceId, chatName, text) {
+        console.log(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","text":"${text}"}`);
+    }
+    errorWithTraceId(botName, traceId, chatName, errorObj, extraData) {
+        console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${extraData ? `,"extraData":${JSON.stringify(extraData)}` : ''}}`);
+    }
+}
+exports.JsonLogger = JsonLogger;

package/dist/services/nodeTimeoutScheduler.d.ts

@@ -0,0 +1,13 @@
+import { TaskRecord } from '../entities/taskRecord';
+import { ILogger } from '../types/logger';
+import { IScheduler } from '../types/scheduler';
+import { Milliseconds } from '../types/timeValues';
+export declare class NodeTimeoutScheduler implements IScheduler {
+    private readonly logger;
+    readonly activeTasks: TaskRecord[];
+    constructor(logger: ILogger);
+    stopAll(): void;
+    createTask(name: string, action: () => void, interval: Milliseconds, executeRightAway: boolean, ownerName: string): void;
+    createOnetimeTask(name: string, action: () => void, delay: Milliseconds, ownerName: string): void;
+}
+//# sourceMappingURL=nodeTimeoutScheduler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nodeTimeoutScheduler.d.ts","sourceRoot":"","sources":["../../services/nodeTimeoutScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,oBAAqB,YAAW,UAAU;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE,CAAM;gBAE5B,MAAM,EAAE,OAAO;IAI3B,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"}

package/dist/services/nodeTimeoutScheduler.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeTimeoutScheduler = void 0;
+const taskRecord_1 = require("../entities/taskRecord");
+class NodeTimeoutScheduler {
+    constructor(logger) {
+        this.activeTasks = [];
+        this.logger = logger;
+    }
+    stopAll() {
+        this.activeTasks.forEach((task) => {
+            clearInterval(task.taskId);
+        });
+    }
+    createTask(name, action, interval, executeRightAway, ownerName) {
+        const taskId = setInterval(action, interval);
+        const task = new taskRecord_1.TaskRecord(name, taskId, interval);
+        if (executeRightAway) {
+            setImmediate(action);
+        }
+        this.logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created task [${taskId}]${name}, that will run every ${interval}ms.`);
+        this.activeTasks.push(task);
+    }
+    createOnetimeTask(name, action, delay, ownerName) {
+        const actionWrapper = () => {
+            this.logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Executing delayed oneshot [${taskId}]${name}`);
+            action();
+        };
+        const taskId = setTimeout(actionWrapper, delay);
+        this.logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created oneshot task [${taskId}]${name}, that will run in ${delay}ms.`);
+    }
+}
+exports.NodeTimeoutScheduler = NodeTimeoutScheduler;

package/dist/services/telegramApi.d.ts

@@ -1,13 +1,15 @@
 import { IStorageClient } from '../types/storage';
 import { BotResponse } from '../types/response';
 import { Telegram } from 'telegraf/typings/telegram';
+import { ILogger } from '../types/logger';
 export declare class TelegramApiService {
+    private readonly telegram;
+    private readonly storage;
+    private readonly logger;
+    private readonly botName;
+    private readonly messageQueue;
     isFlushing: boolean;
-    readonly messageQueue: BotResponse[];
-    readonly botName: string;
-    readonly telegram: Telegram;
-    readonly storage: IStorageClient;
-    constructor(botName: string, telegram: Telegram, storage: IStorageClient);
+    constructor(botName: string, telegram: Telegram, storage: IStorageClient, logger: ILogger);
     enqueueBatchedResponses(responses: BotResponse[]): void;
     flushResponses(): Promise<void>;
     private pinIfShould;

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,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAMrD,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE,CAAM;IAE1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAErB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc;IAMxE,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAM1C,cAAc;YA2BN,WAAW;YAqBX,eAAe;CA8EhC"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI1C,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,UAAU,UAAS;gBAGf,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO;IAQnB,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAM1C,cAAc;YA2BN,WAAW;YAqBX,eAAe;CA8EhC"}

package/dist/services/telegramApi.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelegramApiService = void 0;
-const logger_1 = require("./logger");
 const promises_1 = require("timers/promises");
 const TELEGRAM_RATELIMIT_DELAY = 35;
 class TelegramApiService {
-    constructor(botName, telegram, storage) {
-        this.isFlushing = false;
+    constructor(botName, telegram, storage, logger) {
         this.messageQueue = [];
+        this.isFlushing = false;
         this.telegram = telegram;
         this.botName = botName;
         this.storage = storage;
+        this.logger = logger;
     }
     enqueueBatchedResponses(responses) {
         for (const response of responses) {
@@ -30,7 +30,7 @@ class TelegramApiService {
                 await (0, promises_1.setTimeout)(TELEGRAM_RATELIMIT_DELAY);
             }
             catch (error) {
-                logger_1.Logger.errorWithTraceId(this.botName, message.traceId, message.chatInfo.name, error, message);
+                this.logger.errorWithTraceId(this.botName, message.traceId, message.chatInfo.name, error, message);
             }
         }
         this.isFlushing = false;

package/dist/types/commandCondition.d.ts

@@ -1,4 +1,4 @@
 import { MessageContext } from '../entities/context/messageContext';
 import { IActionState } from './actionState';
-export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>) => Promise<boolean>;
+export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>) => boolean;
 //# sourceMappingURL=commandCondition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC"}

package/dist/types/logger.d.ts

@@ -0,0 +1,6 @@
+export interface ILogger {
+    logObjectWithTraceId(botName: string, traceId: string | number, chatName: string, data: any): void;
+    logWithTraceId(botName: string, traceId: string | number, chatName: string, text: string): void;
+    errorWithTraceId<TData>(botName: string, traceId: string | number, chatName: string, errorObj: unknown, extraData?: TData | undefined): void;
+}
+//# sourceMappingURL=logger.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IACpB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,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,GAC9B,IAAI,CAAC;CACX"}

package/dist/types/logger.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/scheduler.d.ts

@@ -0,0 +1,7 @@
+import { Milliseconds } from './timeValues';
+export interface IScheduler {
+    stopAll(): void;
+    createTask(name: string, action: () => void, interval: Milliseconds, executeRightAway: boolean, ownerName: string): void;
+    createOnetimeTask(name: string, action: () => void, delay: Milliseconds, ownerName: string): void;
+}
+//# sourceMappingURL=scheduler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../types/scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,WAAW,UAAU;IACvB,OAAO,IAAI,IAAI,CAAC;IAEhB,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM,GAClB,IAAI,CAAC;IAER,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,GAClB,IAAI,CAAC;CACX"}

package/dist/types/scheduler.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/storage.d.ts

@@ -1,4 +1,3 @@
-import { ActionExecutionResult } from '../dtos/actionExecutionResult';
 import { IActionState } from './actionState';
 import { ActionKey, IActionWithState } from './actionWithState';
 export interface IStorageClient {
@@ -7,6 +6,6 @@ export interface IStorageClient {
     load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
     saveMetadata<TActionState extends IActionState>(actions: IActionWithState<TActionState>[], botName: string): Promise<void>;
     getActionState<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number): Promise<TActionState>;
-    saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, transactionResult: ActionExecutionResult<TActionState>): Promise<void>;
+    saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, state: TActionState): 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,+BAA+B,CAAC;AACtE,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,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,iBAAiB,EAAE,qBAAqB,CAAC,YAAY,CAAC,GACvD,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,mBAAmB,CAAC;AAEhE,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"}

package/dtos/commandTriggerCheckResult.ts

@@ -6,25 +6,25 @@ export class CommandTriggerCheckResult {
         return new CommandTriggerCheckResult(false, [], false);
     }
 
-    shouldTrigger: boolean;
-    matchResults: RegExpExecArray[];
-    skipCooldown: boolean;
+    readonly shouldExecute: boolean;
+    readonly matchResults: RegExpExecArray[];
+    readonly skipCooldown: boolean;
 
     constructor(
-        shouldTrigger: boolean,
+        shouldExecute: boolean,
         matchResults: RegExpExecArray[],
         skipCooldown: boolean
     ) {
-        this.shouldTrigger = shouldTrigger;
+        this.shouldExecute = shouldExecute;
         this.matchResults = matchResults;
         this.skipCooldown = skipCooldown;
     }
 
     mergeWith(other: CommandTriggerCheckResult) {
-        this.shouldTrigger = this.shouldTrigger || other.shouldTrigger;
-        this.matchResults = this.matchResults.concat(other.matchResults);
-        this.skipCooldown = this.skipCooldown || other.skipCooldown;
-
-        return this;
+        return new CommandTriggerCheckResult(
+            this.shouldExecute || other.shouldExecute,
+            this.matchResults.concat(other.matchResults),
+            this.skipCooldown || other.skipCooldown
+        );
     }
 }

package/dtos/incomingMessage.ts

@@ -4,12 +4,12 @@ import { MessageType, MessageTypeValue } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 
 export class IncomingMessage {
-    message_id: number;
-    chatInfo: ChatInfo;
-    from: User | undefined;
-    text: string;
-    type: MessageTypeValue;
-    traceId = randomInt(10000, 99999);
+    readonly message_id: number;
+    readonly chatInfo: ChatInfo;
+    readonly from: User | undefined;
+    readonly text: string;
+    readonly type: MessageTypeValue;
+    readonly traceId = randomInt(10000, 99999);
 
     private detectMessageType(
         message: Update.New & (Update.NonChannel & Message)

package/entities/actions/commandAction.ts

@@ -8,9 +8,8 @@ import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CommandTriggerCheckResult } from '../../dtos/commandTriggerCheckResult';
 import { MessageContext } from '../context/messageContext';
-import { Logger } from '../../services/logger';
-import { ActionExecutionResult } from '../../dtos/actionExecutionResult';
 import { CommandTrigger } from '../../types/commandTrigger';
+import { Noop } from '../../helpers/noop';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -57,27 +56,23 @@ export class CommandAction<TActionState extends IActionState>
             );
 
         if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
-            return [];
-
-        const isConditionMet = await this.condition(ctx);
-
-        if (!isConditionMet) return [];
+            return Noop.NoResponse;
 
         const state = await ctx.storage.getActionState<TActionState>(
             this,
             ctx.chatInfo.id
         );
 
-        const { shouldTrigger, matchResults, skipCooldown } = this.triggers
-            .map((x) => this.checkTrigger(ctx, x, state))
+        const { shouldExecute, matchResults, skipCooldown } = this.triggers
+            .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
             .reduce(
                 (acc, curr) => acc.mergeWith(curr),
                 CommandTriggerCheckResult.DoNotTrigger
             );
 
-        if (!shouldTrigger) return [];
+        if (!shouldExecute) return Noop.NoResponse;
 
-        Logger.logWithTraceId(
+        ctx.logger.logWithTraceId(
             ctx.botName,
             ctx.traceId,
             ctx.chatInfo.name,
@@ -95,27 +90,20 @@ export class CommandAction<TActionState extends IActionState>
             state.lastExecutedDate = moment().valueOf();
         }
 
-        ctx.updateActions.forEach((action) => action(state));
-
         await ctx.storage.saveActionExecutionResult(
             this,
             ctx.chatInfo.id,
-            new ActionExecutionResult(state, ctx.startCooldown && shouldTrigger)
+            state
         );
 
-        ctx.isInitialized = false;
-
         return ctx.responses;
     }
 
-    private checkTrigger(
+    private checkIfShouldBeExecuted(
         ctx: MessageContext<TActionState>,
         trigger: CommandTrigger,
         state: IActionState
     ) {
-        let shouldTrigger = false;
-        const matchResults: RegExpExecArray[] = [];
-
         if (!ctx.fromUserId)
             return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
 
@@ -135,28 +123,11 @@ export class CommandAction<TActionState extends IActionState>
 
         if (onCooldown) return CommandTriggerCheckResult.DoNotTrigger;
 
-        if (trigger == ctx.messageType) {
-            shouldTrigger = true;
-        } else if (typeof trigger == 'string') {
-            shouldTrigger = ctx.messageText.toLowerCase() == trigger;
-        } else {
-            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);
-                    }
-                }
-            }
+        const isCustomConditionMet = this.condition(ctx);
+        if (!isCustomConditionMet)
+            return CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
 
-            shouldTrigger = matchResults.length > 0;
-        }
+        const { shouldTrigger, matchResults } = this.checkTrigger(ctx, trigger);
 
         return new CommandTriggerCheckResult(
             shouldTrigger,
@@ -164,4 +135,40 @@ export class CommandAction<TActionState extends IActionState>
             false
         );
     }
+
+    private checkTrigger(
+        ctx: MessageContext<TActionState>,
+        trigger: CommandTrigger
+    ) {
+        if (trigger == ctx.messageType)
+            return { shouldTrigger: true, matchResults: [] };
+
+        if (typeof trigger == 'string')
+            return {
+                shouldTrigger: ctx.messageText.toLowerCase() == trigger,
+                matchResults: []
+            };
+
+        const matchResults: RegExpExecArray[] = [];
+
+        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);
+                }
+            }
+        }
+
+        return {
+            shouldTrigger: matchResults.length > 0,
+            matchResults
+        };
+    }
 }