chz-telegram-bot 0.0.51 → 0.0.52

package/dist/dtos/commandTriggerCheckResult.d.ts

@@ -1,10 +1,10 @@
 export declare class CommandTriggerCheckResult {
     static get DontTriggerAndSkipCooldown(): CommandTriggerCheckResult;
     static get DoNotTrigger(): CommandTriggerCheckResult;
-    shouldTrigger: boolean;
-    matchResults: RegExpExecArray[];
-    skipCooldown: boolean;
-    constructor(shouldTrigger: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean);
-    mergeWith(other: CommandTriggerCheckResult): this;
+    readonly shouldExecute: boolean;
+    readonly matchResults: RegExpExecArray[];
+    readonly skipCooldown: boolean;
+    constructor(shouldExecute: boolean, matchResults: RegExpExecArray[], skipCooldown: boolean);
+    mergeWith(other: CommandTriggerCheckResult): CommandTriggerCheckResult;
 }
 //# sourceMappingURL=commandTriggerCheckResult.d.ts.map

package/dist/dtos/commandTriggerCheckResult.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,qBAAa,yBAAyB;IAClC,MAAM,KAAK,0BAA0B,8BAEpC;IACD,MAAM,KAAK,YAAY,8BAEtB;IAED,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,eAAe,EAAE,CAAC;IAChC,YAAY,EAAE,OAAO,CAAC;gBAGlB,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO;IAOzB,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAO7C"}
+{"version":3,"file":"commandTriggerCheckResult.d.ts","sourceRoot":"","sources":["../../dtos/commandTriggerCheckResult.ts"],"names":[],"mappings":"AAAA,qBAAa,yBAAyB;IAClC,MAAM,KAAK,0BAA0B,8BAEpC;IACD,MAAM,KAAK,YAAY,8BAEtB;IAED,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,eAAe,EAAE,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;gBAG3B,aAAa,EAAE,OAAO,EACtB,YAAY,EAAE,eAAe,EAAE,EAC/B,YAAY,EAAE,OAAO;IAOzB,SAAS,CAAC,KAAK,EAAE,yBAAyB;CAO7C"}

package/dist/dtos/commandTriggerCheckResult.js

@@ -8,16 +8,13 @@ class CommandTriggerCheckResult {
     static get DoNotTrigger() {
         return new CommandTriggerCheckResult(false, [], false);
     }
-    constructor(shouldTrigger, matchResults, skipCooldown) {
-        this.shouldTrigger = shouldTrigger;
+    constructor(shouldExecute, matchResults, skipCooldown) {
+        this.shouldExecute = shouldExecute;
         this.matchResults = matchResults;
         this.skipCooldown = skipCooldown;
     }
     mergeWith(other) {
-        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);
     }
 }
 exports.CommandTriggerCheckResult = CommandTriggerCheckResult;

package/dist/dtos/incomingMessage.d.ts

@@ -2,12 +2,12 @@ import { Message, Update, User } from 'telegraf/types';
 import { MessageTypeValue } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 export declare class IncomingMessage {
-    message_id: number;
-    chatInfo: ChatInfo;
-    from: User | undefined;
-    text: string;
-    type: MessageTypeValue;
-    traceId: number;
+    readonly message_id: number;
+    readonly chatInfo: ChatInfo;
+    readonly from: User | undefined;
+    readonly text: string;
+    readonly type: MessageTypeValue;
+    readonly traceId: number;
     private detectMessageType;
     constructor(ctxMessage: Update.New & (Update.NonChannel & Message));
 }

package/dist/dtos/incomingMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,eAAe;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,SAA2B;IAElC,OAAO,CAAC,iBAAiB;gBAkBb,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;CAYrE"}
+{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../dtos/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,eAAe;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,OAAO,SAA2B;IAE3C,OAAO,CAAC,iBAAiB;gBAkBb,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;CAYrE"}

package/dist/entities/actions/commandAction.d.ts

@@ -18,6 +18,7 @@ export declare class CommandAction<TActionState extends IActionState> implements
     readonly key: ActionKey;
     constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldown: Seconds, chatsBlacklist: number[], allowedUsers: number[], condition: CommandCondition<TActionState>, stateConstructor: () => TActionState);
     exec(ctx: MessageContext<TActionState>): Promise<import("../../types/response").BotResponse[]>;
+    private checkIfShouldBeExecuted;
     private checkTrigger;
 }
 //# sourceMappingURL=commandAction.d.ts.map

package/dist/entities/actions/commandAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;gBAGpB,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IA0D5C,OAAO,CAAC,YAAY;CAwDvB"}
+{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACnD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;gBAGpB,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,EAC1C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAkD5C,OAAO,CAAC,uBAAuB;IAqC/B,OAAO,CAAC,YAAY;CAmCvB"}

package/dist/entities/actions/commandAction.js

@@ -8,8 +8,7 @@ const moment_1 = __importDefault(require("moment"));
 const timeConvertions_1 = require("../../helpers/timeConvertions");
 const toArray_1 = require("../../helpers/toArray");
 const commandTriggerCheckResult_1 = require("../../dtos/commandTriggerCheckResult");
-const logger_1 = require("../../services/logger");
-const actionExecutionResult_1 = require("../../dtos/actionExecutionResult");
+const noop_1 = require("../../helpers/noop");
 class CommandAction {
     constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, condition, stateConstructor) {
         this.triggers = (0, toArray_1.toArray)(trigger);
@@ -27,17 +26,14 @@ class CommandAction {
         if (!ctx.isInitialized)
             throw new Error(`Context for ${this.key} is not initialized or already consumed`);
         if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
-            return [];
-        const isConditionMet = await this.condition(ctx);
-        if (!isConditionMet)
-            return [];
+            return noop_1.Noop.NoResponse;
         const state = await ctx.storage.getActionState(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_1.CommandTriggerCheckResult.DoNotTrigger);
-        if (!shouldTrigger)
-            return [];
-        logger_1.Logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, ` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
+        if (!shouldExecute)
+            return noop_1.Noop.NoResponse;
+        ctx.logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, ` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
         ctx.matchResults = matchResults;
         await this.handler(ctx, state);
         if (skipCooldown) {
@@ -46,14 +42,10 @@ class CommandAction {
         if (ctx.startCooldown) {
             state.lastExecutedDate = (0, moment_1.default)().valueOf();
         }
-        ctx.updateActions.forEach((action) => action(state));
-        await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, new actionExecutionResult_1.ActionExecutionResult(state, ctx.startCooldown && shouldTrigger));
-        ctx.isInitialized = false;
+        await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, state);
         return ctx.responses;
     }
-    checkTrigger(ctx, trigger, state) {
-        let shouldTrigger = false;
-        const matchResults = [];
+    checkIfShouldBeExecuted(ctx, trigger, state) {
         if (!ctx.fromUserId)
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
         const isUserAllowed = this.allowedUsers.length == 0 ||
@@ -65,29 +57,38 @@ class CommandAction {
         const onCooldown = (0, moment_1.default)().diff(lastExecutedDate) < cooldownInMilliseconds;
         if (onCooldown)
             return commandTriggerCheckResult_1.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_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
+        const { shouldTrigger, matchResults } = this.checkTrigger(ctx, trigger);
+        return new commandTriggerCheckResult_1.CommandTriggerCheckResult(shouldTrigger, matchResults, false);
+    }
+    checkTrigger(ctx, trigger) {
+        if (trigger == ctx.messageType)
+            return { shouldTrigger: true, matchResults: [] };
+        if (typeof trigger == 'string')
+            return {
+                shouldTrigger: ctx.messageText.toLowerCase() == trigger,
+                matchResults: []
+            };
+        const matchResults = [];
+        trigger.lastIndex = 0;
+        const execResult = trigger.exec(ctx.messageText);
+        if (execResult != null) {
+            matchResults.push(execResult);
+            if (trigger.global) {
+                while (true) {
+                    const nextResult = trigger.exec(ctx.messageText);
+                    if (nextResult == null)
+                        break;
+                    matchResults.push(nextResult);
                 }
             }
-            shouldTrigger = matchResults.length > 0;
         }
-        return new commandTriggerCheckResult_1.CommandTriggerCheckResult(shouldTrigger, matchResults, false);
+        return {
+            shouldTrigger: matchResults.length > 0,
+            matchResults
+        };
     }
 }
 exports.CommandAction = CommandAction;

package/dist/entities/actions/scheduledAction.d.ts

@@ -19,6 +19,6 @@ export declare class ScheduledAction<TActionState extends IActionState> implemen
     constructor(name: string, handler: ScheduledHandler<TActionState>, timeinHours: HoursOfDay, active: boolean, whitelist: number[], cachedStateFactories: Map<string, CachedStateFactory>, stateConstructor: () => TActionState);
     exec(ctx: ChatContext<TActionState>): Promise<import("../../types/response").BotResponse[]>;
     private getCachedValue;
-    private shouldTrigger;
+    private checkIfShouldBeExecuted;
 }
 //# sourceMappingURL=scheduledAction.d.ts.map

package/dist/entities/actions/scheduledAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduledAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/scheduledAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,qBAAa,eAAe,CAAC,YAAY,SAAS,YAAY,CAC1D,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,MAAM,CAAC,QAAQ,CAAC,KAAK,yBAAgC;IAErD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IAExB,QAAQ,CAAC,WAAW,uBAA8B;IAClD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/D,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAG7C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,WAAW,EAAE,UAAU,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAYlC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;YA6C3B,cAAc;IA8C5B,OAAO,CAAC,aAAa;CAaxB"}
+{"version":3,"file":"scheduledAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/scheduledAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,qBAAa,eAAe,CAAC,YAAY,SAAS,YAAY,CAC1D,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,MAAM,CAAC,QAAQ,CAAC,KAAK,yBAAgC;IAErD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,UAAU,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IAExB,QAAQ,CAAC,WAAW,uBAA8B;IAClD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/D,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAG7C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,WAAW,EAAE,UAAU,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAYlC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;YA0C3B,cAAc;IA+C5B,OAAO,CAAC,uBAAuB;CAalC"}

package/dist/entities/actions/scheduledAction.js

@@ -7,9 +7,7 @@ exports.ScheduledAction = void 0;
 const moment_1 = __importDefault(require("moment"));
 const async_sema_1 = require("async-sema");
 const timeConvertions_1 = require("../../helpers/timeConvertions");
-const actionExecutionResult_1 = require("../../dtos/actionExecutionResult");
-const logger_1 = require("../../services/logger");
-const taskScheduler_1 = require("../../services/taskScheduler");
+const noop_1 = require("../../helpers/noop");
 class ScheduledAction {
     constructor(name, handler, timeinHours, active, whitelist, cachedStateFactories, stateConstructor) {
         this.cachedState = new Map();
@@ -26,20 +24,18 @@ class ScheduledAction {
         if (!ctx.isInitialized)
             throw new Error(`Context for ${this.key} is not initialized or already consumed`);
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatInfo.id))
-            return [];
+            return noop_1.Noop.NoResponse;
         const state = await ctx.storage.getActionState(this, ctx.chatInfo.id);
-        const isAllowedToTrigger = this.shouldTrigger(state);
-        if (isAllowedToTrigger) {
-            logger_1.Logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, ` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
-            await this.handler(ctx, (key) => this.getCachedValue(key, ctx.botName), state);
-            state.lastExecutedDate = (0, moment_1.default)().valueOf();
-            ctx.updateActions.forEach((action) => action(state));
-            await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, new actionExecutionResult_1.ActionExecutionResult(state, isAllowedToTrigger));
-        }
-        ctx.isInitialized = false;
+        const isAllowedToTrigger = this.checkIfShouldBeExecuted(state);
+        if (!isAllowedToTrigger)
+            return noop_1.Noop.NoResponse;
+        ctx.logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, ` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
+        await this.handler(ctx, (key) => this.getCachedValue(key, ctx.botName, ctx.scheduler), state);
+        state.lastExecutedDate = (0, moment_1.default)().valueOf();
+        await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, state);
         return ctx.responses;
     }
-    async getCachedValue(key, botName) {
+    async getCachedValue(key, botName, scheduler) {
         if (!this.cachedStateFactories.has(key)) {
             throw new Error(`No shared cache was set up for the key [${key}] in action '${this.name}'`);
         }
@@ -60,14 +56,14 @@ class ScheduledAction {
             const cachedItemFactory = this.cachedStateFactories.get(key);
             const value = await cachedItemFactory.getValue();
             this.cachedState.set(key, value);
-            taskScheduler_1.Scheduler.createOnetimeTask(`Drop cached value [${this.name} : ${key}]`, () => this.cachedState.delete(key), (0, timeConvertions_1.hoursToMilliseconds)(cachedItemFactory.invalidationTimeoutInHours), botName);
+            scheduler.createOnetimeTask(`Drop cached value [${this.name} : ${key}]`, () => this.cachedState.delete(key), (0, timeConvertions_1.hoursToMilliseconds)(cachedItemFactory.invalidationTimeoutInHours), botName);
             return value;
         }
         finally {
             semaphore.release();
         }
     }
-    shouldTrigger(state) {
+    checkIfShouldBeExecuted(state) {
         const startOfToday = (0, moment_1.default)().startOf('day').valueOf();
         const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
         const currentTime = (0, moment_1.default)();

package/dist/entities/botInstance.d.ts

@@ -3,24 +3,32 @@ import { IStorageClient } from '../types/storage';
 import { IActionState } from '../types/actionState';
 import { CommandAction } from './actions/commandAction';
 import { ScheduledAction } from './actions/scheduledAction';
+import { ILogger } from '../types/logger';
+import { IScheduler } from '../types/scheduler';
 export declare class BotInstance {
-    readonly name: string;
     private readonly api;
+    private readonly storage;
+    private readonly scheduler;
+    private readonly logger;
+    readonly name: string;
     private readonly telegraf;
     private readonly commands;
     private readonly scheduled;
     private readonly chats;
-    readonly storage: IStorageClient;
     constructor(options: {
         name: string;
         token: string;
         commands: CommandAction<IActionState>[];
         scheduled: ScheduledAction<IActionState>[];
         chats: Record<string, number>;
-        storageClient?: IStorageClient;
         storagePath?: string;
         scheduledPeriod?: Seconds;
         verboseLoggingForIncomingMessage?: boolean;
+        services?: {
+            storageClient?: IStorageClient;
+            logger?: ILogger;
+            scheduler?: IScheduler;
+        };
     });
     private initializeScheduledProcessing;
     private initializeMessageProcessing;

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

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAS5D,qBAAa,WAAW;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAC/C,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAErB,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;KAC9C;IAoCD,OAAO,CAAC,6BAA6B;IA2CrC,OAAO,CAAC,2BAA2B;IAiC7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YA+BZ,cAAc;CA2B/B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAO5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,qBAAa,WAAW;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;gBAEnC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IAwCD,OAAO,CAAC,6BAA6B;IA2CrC,OAAO,CAAC,2BAA2B;IAiC7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAaT,YAAY;YAmCZ,cAAc;CA2B/B"}

package/dist/entities/botInstance.js

@@ -8,13 +8,13 @@ const telegraf_1 = require("telegraf");
 const timeConvertions_1 = require("../helpers/timeConvertions");
 const jsonFileStorage_1 = require("../services/jsonFileStorage");
 const telegramApi_1 = require("../services/telegramApi");
-const logger_1 = require("../services/logger");
-const taskScheduler_1 = require("../services/taskScheduler");
+const jsonLogger_1 = require("../services/jsonLogger");
 const incomingMessage_1 = require("../dtos/incomingMessage");
 const moment_1 = __importDefault(require("moment"));
 const chatContext_1 = require("./context/chatContext");
 const messageContext_1 = require("./context/messageContext");
 const chatInfo_1 = require("../dtos/chatInfo");
+const nodeTimeoutScheduler_1 = require("../services/nodeTimeoutScheduler");
 class BotInstance {
     constructor(options) {
         this.name = options.name;
@@ -22,22 +22,26 @@ class BotInstance {
         this.scheduled = options.scheduled;
         this.chats = options.chats;
         const actions = [...this.commands, ...this.scheduled];
-        logger_1.Logger.logWithTraceId(this.name, `System:Bot-${this.name}-Start`, 'System', 'Starting bot...');
         this.telegraf = new telegraf_1.Telegraf(options.token);
+        this.logger = options.services?.logger ?? new jsonLogger_1.JsonLogger();
+        this.scheduler =
+            options.services?.scheduler ??
+                new nodeTimeoutScheduler_1.NodeTimeoutScheduler(this.logger);
         this.storage =
-            options.storageClient ??
+            options.services?.storageClient ??
                 new jsonFileStorage_1.JsonFileStorage(options.name, actions, options.storagePath);
-        this.api = new telegramApi_1.TelegramApiService(this.name, this.telegraf.telegram, this.storage);
+        this.api = new telegramApi_1.TelegramApiService(this.name, this.telegraf.telegram, this.storage, this.logger);
         this.initializeMessageProcessing(options.verboseLoggingForIncomingMessage ?? false);
         this.initializeScheduledProcessing(options.scheduledPeriod ?? (0, timeConvertions_1.hoursToSeconds)(1));
         this.storage.saveMetadata(actions, this.name);
+        this.logger.logWithTraceId(this.name, `System:Bot-${this.name}-Start`, 'System', 'Starting bot...');
         this.telegraf.launch();
     }
     initializeScheduledProcessing(period) {
         if (this.scheduled.length > 0) {
             const now = (0, moment_1.default)();
             if (now.minute() == 0 && now.second() == 0) {
-                taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
+                this.scheduler.createTask('ScheduledProcessing', async () => {
                     await this.runScheduled();
                 }, (0, timeConvertions_1.secondsToMilliseconds)(period), true, this.name);
                 return;
@@ -47,8 +51,8 @@ class BotInstance {
                 nextExecutionTime = nextExecutionTime.add(1, 'hour');
             }
             const delay = nextExecutionTime.diff(now);
-            taskScheduler_1.Scheduler.createOnetimeTask('ScheduledProcessing_OneTime', async () => {
-                taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
+            this.scheduler.createOnetimeTask('ScheduledProcessing_OneTime', async () => {
+                this.scheduler.createTask('ScheduledProcessing', async () => {
                     await this.runScheduled();
                 }, (0, timeConvertions_1.secondsToMilliseconds)(period), true, this.name);
             }, delay, this.name);
@@ -62,46 +66,49 @@ class BotInstance {
                 const messageFromName = msg.from?.first_name ?? 'Unknown';
                 const messageFromId = msg.from?.id ?? 'Unknown';
                 if (verboseLoggingForIncomingMessage) {
-                    logger_1.Logger.logObjectWithTraceId(this.name, msg.traceId, msg.chatInfo.name, ctx.update.message);
+                    this.logger.logObjectWithTraceId(this.name, msg.traceId, msg.chatInfo.name, ctx.update.message);
                 }
                 else {
-                    logger_1.Logger.logWithTraceId(this.name, msg.traceId, msg.chatInfo.name, `${messageFromName} (${messageFromId}): ${messageContent}`);
+                    this.logger.logWithTraceId(this.name, msg.traceId, msg.chatInfo.name, `${messageFromName} (${messageFromId}): ${messageContent}`);
                 }
                 await this.processMessage(msg);
             });
         }
     }
     async stop(code) {
-        logger_1.Logger.logWithTraceId(this.name, `System:Bot-${this.name}-Stop`, 'System', 'Stopping bot...');
+        this.logger.logWithTraceId(this.name, `System:Bot-${this.name}-Stop`, 'System', 'Stopping bot...');
+        this.scheduler.stopAll();
         await this.storage.close();
         this.telegraf.stop(code);
     }
     async runScheduled() {
-        const ctx = new chatContext_1.ChatContext();
+        const ctx = new chatContext_1.ChatContext(this.storage, this.logger, this.scheduler);
         for (const [chatName, chatId] of Object.entries(this.chats)) {
             for (const scheduledAction of this.scheduled) {
-                ctx.initializeChatContext(this.name, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName), `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
+                ctx.initializeChatContext(this.name, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName), `Scheduled:${scheduledAction.key}:${chatId}`);
                 try {
                     const responses = await scheduledAction.exec(ctx);
                     this.api.enqueueBatchedResponses(responses);
+                    ctx.isInitialized = false;
                 }
                 catch (error) {
-                    logger_1.Logger.errorWithTraceId(ctx.botName, ctx.traceId, chatName, error, ctx);
+                    this.logger.errorWithTraceId(ctx.botName, ctx.traceId, chatName, error, ctx);
                 }
             }
         }
         await this.api.flushResponses();
     }
     async processMessage(msg) {
-        const ctx = new messageContext_1.MessageContext();
+        const ctx = new messageContext_1.MessageContext(this.storage, this.logger, this.scheduler);
         for (const commandAction of this.commands) {
-            ctx.initializeMessageContext(this.name, commandAction, msg, this.storage);
+            ctx.initializeMessageContext(this.name, commandAction, msg);
             try {
                 const responses = await commandAction.exec(ctx);
                 this.api.enqueueBatchedResponses(responses);
+                ctx.isInitialized = false;
             }
             catch (error) {
-                logger_1.Logger.errorWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, error, ctx);
+                this.logger.errorWithTraceId(ctx.botName, ctx.traceId, ctx.chatInfo.name, error, ctx);
             }
         }
         await this.api.flushResponses();

package/dist/entities/context/chatContext.d.ts

@@ -5,30 +5,30 @@ import { IActionState } from '../../types/actionState';
 import { BotResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { ChatInfo } from '../../dtos/chatInfo';
+import { ILogger } from '../../types/logger';
+import { IScheduler } from '../../types/scheduler';
 /**
  * Context of action executed in chat.
  */
 export declare class ChatContext<TActionState extends IActionState> {
     protected action: IActionWithState<TActionState>;
-    updateActions: Array<(state: TActionState) => void>;
+    /** Storage client instance for the bot executing this action. */
+    readonly storage: IStorageClient;
+    /** Logger instance for the bot executing this action */
+    readonly logger: ILogger;
+    /** Scheduler instance for the bot executing this action */
+    readonly scheduler: IScheduler;
     /** Trace id of a action execution. */
     traceId: number | string;
     /** Name of a bot that executes this action. */
     botName: string;
     /** Chat information. */
     chatInfo: ChatInfo;
-    /** Storage client instance for this bot. */
-    storage: IStorageClient;
     /** Ordered collection of responses to be processed  */
     responses: BotResponse[];
     isInitialized: boolean;
-    constructor();
-    initializeChatContext(botName: string, action: IActionWithState<TActionState>, chatInfo: ChatInfo, traceId: number | string, storage: IStorageClient): this;
-    /**
-     * Manually update the state of an action.
-     * @param stateUpdateAction Function that will modify state.
-     */
-    updateState(stateUpdateAction: (state: TActionState) => void): void;
+    constructor(storage: IStorageClient, logger: ILogger, scheduler: IScheduler);
+    initializeChatContext(botName: string, action: IActionWithState<TActionState>, chatInfo: ChatInfo, traceId: number | string): this;
     /**
      * Sends text message to chat after action execution is finished.
      * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.

package/dist/entities/context/chatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C;;GAEG;AACH,qBAAa,WAAW,CAAC,YAAY,SAAS,YAAY;IACtD,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAClD,aAAa,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,CAAM;IACzD,sCAAsC;IACtC,OAAO,EAAG,MAAM,GAAG,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IACpB,4CAA4C;IAC5C,OAAO,EAAG,cAAc,CAAC;IACzB,uDAAuD;IACvD,SAAS,EAAE,WAAW,EAAE,CAAM;IAE9B,aAAa,UAAS;;IAItB,qBAAqB,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,cAAc;IAe3B;;;OAGG;IACH,WAAW,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;IAI5D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAahE;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;IAW9B;;;OAGG;IACH,iBAAiB,CAAC,KAAK,EAAE,YAAY;CAKxC"}
+{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD;;GAEG;AACH,qBAAa,WAAW,CAAC,YAAY,SAAS,YAAY;IACtD,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAElD,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAG,cAAc,CAAC;IAClC,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAG,OAAO,CAAC;IAC1B,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAG,UAAU,CAAC;IAEhC,sCAAsC;IACtC,OAAO,EAAG,MAAM,GAAG,MAAM,CAAC;IAC1B,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IACpB,uDAAuD;IACvD,SAAS,EAAE,WAAW,EAAE,CAAM;IAE9B,aAAa,UAAS;gBAGlB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,UAAU;IAOzB,qBAAqB,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GAAG,MAAM;IAa5B;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAahE;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;IAW9B;;;OAGG;IACH,iBAAiB,CAAC,KAAK,EAAE,YAAY;CAKxC"}

package/dist/entities/context/chatContext.js

@@ -11,30 +11,23 @@ const delay_1 = require("../../dtos/responses/delay");
  * Context of action executed in chat.
  */
 class ChatContext {
-    constructor() {
-        this.updateActions = [];
+    constructor(storage, logger, scheduler) {
         /** Ordered collection of responses to be processed  */
         this.responses = [];
         this.isInitialized = false;
+        this.storage = storage;
+        this.logger = logger;
+        this.scheduler = scheduler;
     }
-    initializeChatContext(botName, action, chatInfo, traceId, storage) {
+    initializeChatContext(botName, action, chatInfo, traceId) {
         this.botName = botName;
         this.action = action;
         this.chatInfo = chatInfo;
         this.traceId = traceId;
-        this.storage = storage;
-        this.updateActions = [];
         this.isInitialized = true;
         this.responses = [];
         return this;
     }
-    /**
-     * Manually update the state of an action.
-     * @param stateUpdateAction Function that will modify state.
-     */
-    updateState(stateUpdateAction) {
-        this.updateActions.push(stateUpdateAction);
-    }
     /**
      * Sends text message to chat after action execution is finished.
      * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.

package/dist/entities/context/messageContext.d.ts

@@ -6,6 +6,8 @@ import { IncomingMessage } from '../../dtos/incomingMessage';
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/actionWithState';
 import { MessageTypeValue } from '../../types/messageTypes';
+import { ILogger } from '../../types/logger';
+import { IScheduler } from '../../types/scheduler';
 /**
  * Context of action executed in chat, in response to a message
  */
@@ -24,8 +26,8 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     fromUserName: string;
     /** Type of message being received */
     messageType: MessageTypeValue;
-    constructor();
-    initializeMessageContext(botName: string, action: IActionWithState<TActionState>, message: IncomingMessage, storage: IStorageClient): this;
+    constructor(storage: IStorageClient, logger: ILogger, scheduler: IScheduler);
+    initializeMessageContext(botName: string, action: IActionWithState<TActionState>, message: IncomingMessage): this;
     /**
      * Loads state of another action. Changes to the loaded state will no affect actual state of other action.
      * @param commandName Name of an action to load state of.

package/dist/entities/context/messageContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,4HAA4H;IAC5H,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kGAAkG;IAClG,aAAa,EAAE,OAAO,CAAQ;IAC9B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;;IAM/B,wBAAwB,CACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc;IAsB3B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAG,MAAM,CAAC;IACnB,oDAAoD;IACpD,WAAW,EAAG,MAAM,CAAC;IACrB,4HAA4H;IAC5H,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,mEAAmE;IACnE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kGAAkG;IAClG,aAAa,EAAE,OAAO,CAAQ;IAC9B,qEAAqE;IACrE,YAAY,EAAG,MAAM,CAAC;IACtB,qCAAqC;IACrC,WAAW,EAAG,gBAAgB,CAAC;gBAG3B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,UAAU;IAKzB,wBAAwB,CACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,OAAO,EAAE,eAAe;IAqB5B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;;OAKG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}

package/dist/entities/context/messageContext.js

@@ -12,14 +12,14 @@ const chatContext_1 = require("./chatContext");
  * Context of action executed in chat, in response to a message
  */
 class MessageContext extends chatContext_1.ChatContext {
-    constructor() {
-        super();
+    constructor(storage, logger, scheduler) {
+        super(storage, logger, scheduler);
         /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
         this.matchResults = [];
         /** Indicates if cooldown should be started after action is executed. Set to `true` by default. */
         this.startCooldown = true;
     }
-    initializeMessageContext(botName, action, message, storage) {
+    initializeMessageContext(botName, action, message) {
         this.messageId = message.message_id;
         this.messageText = message.text ?? '';
         this.messageType = message.type;
@@ -29,7 +29,7 @@ class MessageContext extends chatContext_1.ChatContext {
                 (message.from?.last_name ? ` ${message.from.last_name}` : '');
         this.matchResults = [];
         this.startCooldown = true;
-        return this.initializeChatContext(botName, action, message.chatInfo, message.traceId, storage);
+        return this.initializeChatContext(botName, action, message.chatInfo, message.traceId);
     }
     /**
      * Loads state of another action. Changes to the loaded state will no affect actual state of other action.

package/dist/helpers/noop.d.ts

@@ -1,6 +1,8 @@
+import { BotResponse } from '../types/response';
 export declare class Noop {
-    static true<T1>(arg1: T1): Promise<boolean>;
-    static false<T1>(arg1: T1): Promise<boolean>;
+    static NoResponse: BotResponse[];
+    static true<T1>(arg1: T1): boolean;
+    static false<T1>(arg1: T1): boolean;
     static call<T1, T2>(arg1: T1, arg2: T2): Promise<void>;
 }
 //# sourceMappingURL=noop.d.ts.map

package/dist/helpers/noop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noop.d.ts","sourceRoot":"","sources":["../../helpers/noop.ts"],"names":[],"mappings":"AACA,qBAAa,IAAI;WACA,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;WAGjB,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;WAGlB,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAE/D"}
+{"version":3,"file":"noop.d.ts","sourceRoot":"","sources":["../../helpers/noop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,qBAAa,IAAI;IACb,MAAM,CAAC,UAAU,EAAE,WAAW,EAAE,CAAM;IACtC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;IAGxB,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;WAGZ,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAE/D"}

package/dist/helpers/noop.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Noop = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
 class Noop {
-    static async true(arg1) {
+    static true(arg1) {
         return true;
     }
-    static async false(arg1) {
+    static false(arg1) {
         return false;
     }
     static async call(arg1) { }
 }
 exports.Noop = Noop;
+Noop.NoResponse = [];