chz-telegram-bot 0.0.51 → 0.0.53

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,7 @@
+import { TraceId } from './trace';
+export interface ILogger {
+    logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: any): void;
+    logWithTraceId(botName: string, traceId: TraceId, chatName: string, text: string): void;
+    errorWithTraceId<TData>(botName: string, traceId: TraceId, 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,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,WAAW,OAAO;IACpB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,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/response.d.ts

@@ -7,6 +7,7 @@ import { UnpinResponse } from '../dtos/responses/unpin';
 import { VideoMessage } from '../dtos/responses/videoMessage';
 import { IActionState } from './actionState';
 import { IActionWithState } from './actionWithState';
+import { TraceId } from './trace';
 export declare const BotResponseTypes: {
     readonly unpin: "unpin";
     readonly text: "text";
@@ -19,7 +20,7 @@ export type BotResponse = UnpinResponse | Reaction | TextMessage | VideoMessage
 export interface IChatResponse {
     readonly kind: keyof typeof BotResponseTypes;
     readonly chatInfo: ChatInfo;
-    readonly traceId: number | string;
+    readonly traceId: TraceId;
     readonly action: IActionWithState<IActionState>;
 }
 export interface IReplyMessage<TType> extends IChatResponse {

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

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,gBAAgB;;;;;;;CAOnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,aAAa,GACb,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IAElC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,aAAa,CAAC,KAAK,CAAE,SAAQ,aAAa;IACvD,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,eAAO,MAAM,gBAAgB;;;;;;;CAOnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,aAAa,GACb,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,aAAa,CAAC,KAAK,CAAE,SAAQ,aAAa;IACvD,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B"}

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/dist/types/trace.d.ts

@@ -0,0 +1,2 @@
+export type TraceId = `${string}:${string}-${string}`;
+//# sourceMappingURL=trace.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../types/trace.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC"}

package/dist/types/trace.js

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

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

@@ -2,14 +2,16 @@ import { Message, Update, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
 import { MessageType, MessageTypeValue } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
+import { createTrace } from '../helpers/traceFactory';
+import { TraceId } from '../types/trace';
 
 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: TraceId;
 
     private detectMessageType(
         message: Update.New & (Update.NonChannel & Message)
@@ -29,7 +31,15 @@ export class IncomingMessage {
         return MessageType.Unknown;
     }
 
-    constructor(ctxMessage: Update.New & (Update.NonChannel & Message)) {
+    constructor(
+        ctxMessage: Update.New & (Update.NonChannel & Message),
+        botName: string
+    ) {
+        this.traceId = createTrace(
+            this,
+            botName,
+            randomInt(10000, 99999).toString()
+        );
         this.message_id = ctxMessage.message_id;
         this.from = ctxMessage.from;
         this.text = 'text' in ctxMessage ? ctxMessage.text : '';

package/dtos/responses/delay.ts

@@ -2,20 +2,21 @@ import { IActionState } from '../../types/actionState';
 import { IActionWithState } from '../../types/actionWithState';
 import { BotResponseTypes, IChatResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
+import { TraceId } from '../../types/trace';
 import { ChatInfo } from '../chatInfo';
 
 export class DelayResponse implements IChatResponse {
     readonly kind = BotResponseTypes.delay;
 
     readonly chatInfo: ChatInfo;
-    readonly traceId: number | string;
+    readonly traceId: TraceId;
     readonly delay: Milliseconds;
     readonly action: IActionWithState<IActionState>;
 
     constructor(
         delay: Milliseconds,
         chatInfo: ChatInfo,
-        traceId: number | string,
+        traceId: TraceId,
         action: IActionWithState<IActionState>
     ) {
         this.chatInfo = chatInfo;

package/dtos/responses/imageMessage.ts

@@ -4,6 +4,7 @@ import { MessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/actionWithState';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
+import { TraceId } from '../../types/trace';
 
 export class ImageMessage implements IReplyMessage<InputFile> {
     readonly kind = BotResponseTypes.image;
@@ -11,7 +12,7 @@ export class ImageMessage implements IReplyMessage<InputFile> {
     readonly content: InputFile;
     readonly chatInfo: ChatInfo;
     readonly replyId: number | undefined;
-    readonly traceId: string | number;
+    readonly traceId: TraceId;
     readonly disableWebPreview = false;
     readonly shouldPin: boolean;
     readonly action: IActionWithState<IActionState>;
@@ -20,7 +21,7 @@ export class ImageMessage implements IReplyMessage<InputFile> {
         image: InputFile,
         chatInfo: ChatInfo,
         replyId: number | undefined,
-        traceId: number | string,
+        traceId: TraceId,
         action: IActionWithState<IActionState>,
         options?: MessageSendingOptions
     ) {

package/dtos/responses/reaction.ts

@@ -3,18 +3,19 @@ import { BotResponseTypes, IChatResponse } from '../../types/response';
 import { IActionWithState } from '../../types/actionWithState';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
+import { TraceId } from '../../types/trace';
 
 export class Reaction implements IChatResponse {
     readonly kind = BotResponseTypes.react;
 
     readonly chatInfo: ChatInfo;
     readonly messageId: number;
-    readonly traceId: number | string;
+    readonly traceId: TraceId;
     readonly emoji: TelegramEmoji;
     readonly action: IActionWithState<IActionState>;
 
     constructor(
-        traceId: number | string,
+        traceId: TraceId,
         chatInfo: ChatInfo,
         messageId: number,
         emoji: TelegramEmoji,

package/dtos/responses/textMessage.ts

@@ -3,6 +3,7 @@ import { BotResponseTypes, IReplyMessage } from '../../types/response';
 import { IActionWithState } from '../../types/actionWithState';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
+import { TraceId } from '../../types/trace';
 
 export class TextMessage implements IReplyMessage<string> {
     readonly kind = BotResponseTypes.text;
@@ -10,7 +11,7 @@ export class TextMessage implements IReplyMessage<string> {
     readonly content: string;
     readonly chatInfo: ChatInfo;
     readonly replyId: number | undefined;
-    readonly traceId: string | number;
+    readonly traceId: TraceId;
     readonly disableWebPreview: boolean;
     readonly shouldPin: boolean;
     readonly action: IActionWithState<IActionState>;
@@ -19,7 +20,7 @@ export class TextMessage implements IReplyMessage<string> {
         text: string,
         chatInfo: ChatInfo,
         replyId: number | undefined,
-        traceId: string | number,
+        traceId: TraceId,
         action: IActionWithState<IActionState>,
         options?: TextMessageSendingOptions
     ) {

package/dtos/responses/unpin.ts

@@ -2,19 +2,20 @@ import { BotResponseTypes, IChatResponse } from '../../types/response';
 import { IActionWithState } from '../../types/actionWithState';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
+import { TraceId } from '../../types/trace';
 
 export class UnpinResponse implements IChatResponse {
     readonly kind = BotResponseTypes.unpin;
 
     readonly messageId: number;
     readonly chatInfo: ChatInfo;
-    readonly traceId: number | string;
+    readonly traceId: TraceId;
     readonly action: IActionWithState<IActionState>;
 
     constructor(
         messageId: number,
         chatInfo: ChatInfo,
-        traceId: number | string,
+        traceId: TraceId,
         action: IActionWithState<IActionState>
     ) {
         this.messageId = messageId;

package/dtos/responses/videoMessage.ts

@@ -4,6 +4,7 @@ import { MessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/actionWithState';
 import { IActionState } from '../../types/actionState';
 import { ChatInfo } from '../chatInfo';
+import { TraceId } from '../../types/trace';
 
 export class VideoMessage implements IReplyMessage<InputFile> {
     readonly kind = BotResponseTypes.video;
@@ -11,7 +12,7 @@ export class VideoMessage implements IReplyMessage<InputFile> {
     readonly content: InputFile;
     readonly chatInfo: ChatInfo;
     readonly replyId: number | undefined;
-    readonly traceId: string | number;
+    readonly traceId: TraceId;
     readonly disableWebPreview = false;
     readonly shouldPin: boolean;
     readonly action: IActionWithState<IActionState>;
@@ -20,7 +21,7 @@ export class VideoMessage implements IReplyMessage<InputFile> {
         video: InputFile,
         chatInfo: ChatInfo,
         replyId: number | undefined,
-        traceId: number | string,
+        traceId: TraceId,
         action: IActionWithState<IActionState>,
         options?: MessageSendingOptions
     ) {

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
+        };
+    }
 }

package/entities/actions/scheduledAction.ts

@@ -7,9 +7,8 @@ import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
-import { ActionExecutionResult } from '../../dtos/actionExecutionResult';
-import { Logger } from '../../services/logger';
-import { Scheduler } from '../../services/taskScheduler';
+import { Noop } from '../../helpers/noop';
+import { IScheduler } from '../../types/scheduler';
 
 export class ScheduledAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -53,47 +52,45 @@ export class ScheduledAction<TActionState extends IActionState>
             );
 
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatInfo.id))
-            return [];
+            return Noop.NoResponse;
 
         const state = await ctx.storage.getActionState<TActionState>(
             this,
             ctx.chatInfo.id
         );
-        const isAllowedToTrigger = this.shouldTrigger(state);
-
-        if (isAllowedToTrigger) {
-            Logger.logWithTraceId(
-                ctx.botName,
-                ctx.traceId,
-                ctx.chatInfo.name,
-                ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
-            );
 
-            await this.handler(
-                ctx,
-                <TResult>(key: string) =>
-                    this.getCachedValue<TResult>(key, ctx.botName),
-                state
-            );
+        const isAllowedToTrigger = this.checkIfShouldBeExecuted(state);
+        if (!isAllowedToTrigger) return Noop.NoResponse;
 
-            state.lastExecutedDate = moment().valueOf();
+        ctx.logger.logWithTraceId(
+            ctx.botName,
+            ctx.traceId,
+            ctx.chatInfo.name,
+            ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
+        );
 
-            ctx.updateActions.forEach((action) => action(state));
-            await ctx.storage.saveActionExecutionResult(
-                this,
-                ctx.chatInfo.id,
-                new ActionExecutionResult(state, isAllowedToTrigger)
-            );
-        }
+        await this.handler(
+            ctx,
+            <TResult>(key: string) =>
+                this.getCachedValue<TResult>(key, ctx.botName, ctx.scheduler),
+            state
+        );
+
+        state.lastExecutedDate = moment().valueOf();
 
-        ctx.isInitialized = false;
+        await ctx.storage.saveActionExecutionResult(
+            this,
+            ctx.chatInfo.id,
+            state
+        );
 
         return ctx.responses;
     }
 
     private async getCachedValue<TResult>(
         key: string,
-        botName: string
+        botName: string,
+        scheduler: IScheduler
     ): Promise<TResult> {
         if (!this.cachedStateFactories.has(key)) {
             throw new Error(
@@ -122,7 +119,7 @@ export class ScheduledAction<TActionState extends IActionState>
 
             this.cachedState.set(key, value);
 
-            Scheduler.createOnetimeTask(
+            scheduler.createOnetimeTask(
                 `Drop cached value [${this.name} : ${key}]`,
                 () => this.cachedState.delete(key),
                 hoursToMilliseconds(
@@ -137,7 +134,7 @@ export class ScheduledAction<TActionState extends IActionState>
         }
     }
 
-    private shouldTrigger(state: IActionState): boolean {
+    private checkIfShouldBeExecuted(state: IActionState): boolean {
         const startOfToday = moment().startOf('day').valueOf();
         const lastExecutedDate = moment(state.lastExecutedDate);
         const currentTime = moment();