chz-telegram-bot 0.0.43 → 0.0.45

package/entities/actions/commandAction.ts

@@ -51,6 +51,8 @@ export class CommandAction<TActionState extends IActionState>
     }
 
     async exec(ctx: MessageContext<TActionState>) {
+        if (!ctx.isInitialized) throw new Error('Context is not initialized');
+
         if (!this.active || this.chatsBlacklist.includes(ctx.chatId)) return;
 
         const isConditionMet = await this.condition(ctx);

package/entities/actions/scheduledAction.ts

@@ -14,7 +14,7 @@ import { Scheduler } from '../../services/taskScheduler';
 export class ScheduledAction<TActionState extends IActionState>
     implements IActionWithState
 {
-    static semaphore = new Semaphore(1);
+    static locks = new Map<string, Semaphore>();
 
     name: string;
     timeinHours: HoursOfDay;
@@ -47,6 +47,8 @@ export class ScheduledAction<TActionState extends IActionState>
     }
 
     async exec(ctx: ChatContext<TActionState>) {
+        if (!ctx.isInitialized) throw new Error('Context is not initialized');
+
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatId)) return;
 
         const state = await ctx.storage.getActionState<TActionState>(
@@ -91,7 +93,16 @@ export class ScheduledAction<TActionState extends IActionState>
             );
         }
 
-        await ScheduledAction.semaphore.acquire();
+        const semaphoreKey = `${this.key}_cached:${key}`;
+        let semaphore: Semaphore;
+        if (ScheduledAction.locks.has(semaphoreKey)) {
+            semaphore = ScheduledAction.locks.get(semaphoreKey)!;
+        } else {
+            semaphore = new Semaphore(1);
+            ScheduledAction.locks.set(semaphoreKey, semaphore);
+        }
+
+        await semaphore.acquire();
 
         try {
             if (this.cachedState.has(key)) {
@@ -114,7 +125,7 @@ export class ScheduledAction<TActionState extends IActionState>
 
             return value as TResult;
         } finally {
-            ScheduledAction.semaphore.release();
+            semaphore.release();
         }
     }
 

package/entities/botInstance.ts

@@ -14,6 +14,8 @@ import { Logger } from '../services/logger';
 import { Scheduler } from '../services/taskScheduler';
 import { IncomingMessage } from './incomingMessage';
 import moment from 'moment';
+import { ChatContext } from './context/chatContext';
+import { MessageContext } from './context/messageContext';
 
 export class BotInstance {
     name: string;
@@ -160,12 +162,11 @@ export class BotInstance {
     }
 
     private async runScheduled() {
+        const ctx = new ChatContext<IActionState>();
+
         for (const [chatName, chatId] of Object.entries(this.chats)) {
             for (const scheduledAction of this.scheduled) {
-                const ctx = this.api.createContextForChat(
-                    chatId,
-                    scheduledAction
-                );
+                this.api.initializeContextForChat(ctx, chatId, scheduledAction);
 
                 try {
                     await scheduledAction.exec(ctx);
@@ -185,8 +186,10 @@ export class BotInstance {
     }
 
     private async processMessage(msg: IncomingMessage) {
+        const ctx = new MessageContext<IActionState>();
+
         for (const commandAction of this.commands) {
-            const ctx = this.api.createContextForMessage(msg, commandAction);
+            this.api.initializeContextForMessage(ctx, msg, commandAction);
 
             try {
                 await commandAction.exec(ctx);

package/entities/context/chatContext.ts

@@ -15,21 +15,25 @@ import { IActionWithState } from '../../types/actionWithState';
  * Context of action executed in chat.
  */
 export class ChatContext<TActionState> {
-    protected action: IActionWithState;
-    protected interactions: IBotApiInteractions;
+    protected action!: IActionWithState;
+    protected interactions!: IBotApiInteractions;
     updateActions: Array<(state: TActionState) => void> = [];
     /** Trace id of a action execution. */
-    traceId: number | string;
+    traceId!: number | string;
     /** Name of a bot that executes this action. */
-    botName: string;
+    botName!: string;
     /** Id of a chat that action is executed in. */
-    chatId: number;
+    chatId!: number;
     /** Name of a chat that action is executed in. */
-    chatName: string;
+    chatName!: string;
     /** Storage client instance for this bot. */
-    storage: IStorageClient;
+    storage!: IStorageClient;
 
-    constructor(
+    isInitialized = false;
+
+    constructor() {}
+
+    initializeChatContext(
         botName: string,
         action: IActionWithState,
         interactions: IBotApiInteractions,
@@ -45,6 +49,11 @@ export class ChatContext<TActionState> {
         this.chatName = chatName;
         this.traceId = traceId;
         this.storage = storage;
+
+        this.updateActions = [];
+        this.isInitialized = true;
+
+        return this;
     }
 
     /**

package/entities/context/messageContext.ts

@@ -24,9 +24,9 @@ export class MessageContext<
     TActionState extends IActionState
 > extends ChatContext<TActionState> {
     /** Id of a message that triggered this action. */
-    messageId: number;
+    messageId!: number;
     /** Text of a message that triggered this action. */
-    messageText: string;
+    messageText!: string;
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults: RegExpMatchArray[] = [];
     /** Id of a user that sent a message that triggered this action. */
@@ -34,18 +34,33 @@ export class MessageContext<
     /** Indicates if cooldown should be started after action is executed. Set to `true` by default. */
     startCooldown: boolean = true;
     /** Name of a user that sent a message that triggered this action. */
-    fromUserName: string;
+    fromUserName!: string;
     /** Type of message being received */
-    messageType: MessageTypeValue;
+    messageType!: MessageTypeValue;
 
-    constructor(
+    constructor() {
+        super();
+    }
+
+    initializeMessageContext(
         botName: string,
         action: IActionWithState,
         interactions: IBotApiInteractions,
         message: IncomingMessage,
         storage: IStorageClient
     ) {
-        super(
+        this.messageId = message.message_id;
+        this.messageText = message.text ?? '';
+        this.messageType = message.type;
+        this.fromUserId = message.from?.id;
+        this.fromUserName =
+            (message.from?.first_name ?? 'Unknown user') +
+            (message.from?.last_name ? ` ${message.from.last_name}` : '');
+
+        this.matchResults = [];
+        this.startCooldown = true;
+
+        return this.initializeChatContext(
             botName,
             action,
             interactions,
@@ -54,14 +69,6 @@ export class MessageContext<
             message.traceId,
             storage
         );
-
-        this.messageId = message.message_id;
-        this.messageText = message.text ?? '';
-        this.messageType = message.type;
-        this.fromUserId = message.from?.id;
-        this.fromUserName =
-            (message.from?.first_name ?? 'Unknown user') +
-            (message.from?.last_name ? ` ${message.from.last_name}` : '');
     }
 
     /**

package/entities/incomingMessage.ts

@@ -14,6 +14,7 @@ export class IncomingMessage {
     private detectMessageType(
         message: Update.New & (Update.NonChannel & Message)
     ) {
+        if ('text' in message) return MessageType.Text;
         if ('photo' in message) return MessageType.Photo;
         if ('sticker' in message) return MessageType.Sticker;
         if ('animation' in message) return MessageType.Animation;

package/package.json

@@ -1,29 +1,29 @@
-{
-    "name": "chz-telegram-bot",
-    "version": "0.0.43",
-    "type": "module",
-    "dependencies": {
-        "async-sema": "^3.1.1",
-        "moment": "^2.29.4",
-        "telegraf": "^4.16.3"
-    },
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "devDependencies": {
-        "@eslint/js": "^9.10.0",
-        "@types/markdown-escape": "^1.1.3",
-        "@types/node": "^22.5.5",
-        "eslint": "^9.10.0",
-        "typescript": "^5.6.2",
-        "typescript-eslint": "^8.5.0"
-    },
-    "scripts": {
-        "build": "tsc",
-        "lint": "npx eslint && tsc --noEmit"
-    },
-    "overrides": {
-        "telegraf": {
-            "node-fetch": "3.3.2"
-        }
-    }
-}
+{
+    "name": "chz-telegram-bot",
+    "version": "0.0.45",
+    "type": "module",
+    "dependencies": {
+        "async-sema": "^3.1.1",
+        "moment": "^2.29.4",
+        "telegraf": "^4.16.3"
+    },
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "devDependencies": {
+        "@eslint/js": "^9.10.0",
+        "@types/markdown-escape": "^1.1.3",
+        "@types/node": "^22.5.5",
+        "eslint": "^9.10.0",
+        "typescript": "^5.6.2",
+        "typescript-eslint": "^8.5.0"
+    },
+    "scripts": {
+        "build": "tsc",
+        "lint": "npx eslint && tsc --noEmit"
+    },
+    "overrides": {
+        "telegraf": {
+            "node-fetch": "3.3.2"
+        }
+    }
+}

package/services/telegramApi.ts

@@ -175,11 +175,12 @@ export class TelegramApiService {
         this.messageQueue.push(response);
     }
 
-    createContextForMessage<TActionState extends IActionState>(
+    initializeContextForMessage<TActionState extends IActionState>(
+        ctx: MessageContext<TActionState>,
         incomingMessage: IncomingMessage,
         command: CommandAction<TActionState>
     ) {
-        return new MessageContext<TActionState>(
+        return ctx.initializeMessageContext(
             this.botName,
             command,
             this.interactions,
@@ -188,11 +189,12 @@ export class TelegramApiService {
         );
     }
 
-    createContextForChat<TActionState extends IActionState>(
+    initializeContextForChat<TActionState extends IActionState>(
+        ctx: ChatContext<TActionState>,
         chatId: number,
         scheduledAction: ScheduledAction<TActionState>
     ) {
-        return new ChatContext<TActionState>(
+        return ctx.initializeChatContext(
             this.botName,
             scheduledAction,
             this.interactions,

package/dist/entities/actionExecutionResult.d.ts

@@ -1,7 +0,0 @@
-import { IActionState } from '../types/actionState';
-export declare class ActionExecutionResult {
-    data: IActionState;
-    shouldUpdate: boolean;
-    constructor(data: IActionState, shouldUpdate: boolean);
-}
-//# sourceMappingURL=actionExecutionResult.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"actionExecutionResult.d.ts","sourceRoot":"","sources":["../../entities/actionExecutionResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,qBAAa,qBAAqB;IAC9B,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;gBAEV,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO;CAIxD"}

package/dist/entities/actionExecutionResult.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActionExecutionResult = void 0;
-class ActionExecutionResult {
-    constructor(data, shouldUpdate) {
-        this.data = data;
-        this.shouldUpdate = shouldUpdate;
-    }
-}
-exports.ActionExecutionResult = ActionExecutionResult;

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

@@ -1,23 +0,0 @@
-import { CommandHandler } from '../../types/handlers';
-import { CommandCondition } from '../../types/commandCondition';
-import { Seconds } from '../../types/timeValues';
-import { IActionState } from '../../types/actionState';
-import { IActionWithState, ActionKey } from '../../types/actionWithState';
-import { MessageContext } from '../context/messageContext';
-import { CommandTrigger } from '../../types/commandTrigger';
-export declare class CommandAction<TActionState extends IActionState> implements IActionWithState {
-    triggers: CommandTrigger[];
-    handler: CommandHandler<TActionState>;
-    name: string;
-    cooldownInSeconds: Seconds;
-    active: boolean;
-    chatsBlacklist: number[];
-    allowedUsers: number[];
-    condition: CommandCondition<TActionState>;
-    stateConstructor: () => TActionState;
-    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<void>;
-    private checkTrigger;
-}
-//# sourceMappingURL=commandAction.d.ts.map

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

@@ -1 +0,0 @@
-{"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;IAE3B,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,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;IAgD5C,OAAO,CAAC,YAAY;CAwDvB"}

package/dist/entities/actions/commandAction.js

@@ -1,89 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandAction = void 0;
-const moment_1 = __importDefault(require("moment"));
-const timeConvertions_1 = require("../../helpers/timeConvertions");
-const toArray_1 = require("../../helpers/toArray");
-const commandTriggerCheckResult_1 = require("../commandTriggerCheckResult");
-const logger_1 = require("../../services/logger");
-const actionExecutionResult_1 = require("../actionExecutionResult");
-class CommandAction {
-    constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, condition, stateConstructor) {
-        this.triggers = (0, toArray_1.toArray)(trigger);
-        this.handler = handler;
-        this.name = name;
-        this.cooldownInSeconds = cooldown;
-        this.active = active;
-        this.chatsBlacklist = chatsBlacklist;
-        this.allowedUsers = allowedUsers;
-        this.condition = condition;
-        this.stateConstructor = stateConstructor;
-        this.key = `command:${this.name.replace('.', '-')}`;
-    }
-    async exec(ctx) {
-        if (!this.active || this.chatsBlacklist.includes(ctx.chatId))
-            return;
-        const isConditionMet = await this.condition(ctx);
-        if (!isConditionMet)
-            return;
-        const state = await ctx.storage.getActionState(this, ctx.chatId);
-        const { shouldTrigger, matchResults, skipCooldown } = this.triggers
-            .map((x) => this.checkTrigger(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.chatName, ` - Executing [${this.name}] in ${ctx.chatId}`);
-        ctx.matchResults = matchResults;
-        await this.handler(ctx, state);
-        if (skipCooldown) {
-            ctx.startCooldown = false;
-        }
-        if (ctx.startCooldown) {
-            state.lastExecutedDate = (0, moment_1.default)().valueOf();
-        }
-        ctx.updateActions.forEach((action) => action(state));
-        await ctx.storage.saveActionExecutionResult(this, ctx.chatId, new actionExecutionResult_1.ActionExecutionResult(state, ctx.startCooldown && shouldTrigger));
-    }
-    checkTrigger(ctx, trigger, state) {
-        let shouldTrigger = false;
-        const matchResults = [];
-        if (!ctx.fromUserId)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
-        const isUserAllowed = this.allowedUsers.length == 0 ||
-            this.allowedUsers.includes(ctx.fromUserId);
-        if (!isUserAllowed)
-            return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
-        const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
-        const cooldownInMilliseconds = (0, timeConvertions_1.secondsToMilliseconds)(this.cooldownInSeconds);
-        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);
-                    }
-                }
-            }
-            shouldTrigger = matchResults.length > 0;
-        }
-        return new commandTriggerCheckResult_1.CommandTriggerCheckResult(shouldTrigger, matchResults, false);
-    }
-}
-exports.CommandAction = CommandAction;

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

@@ -1,24 +0,0 @@
-import { Sema as Semaphore } from 'async-sema';
-import { ScheduledHandler } from '../../types/handlers';
-import { HoursOfDay } from '../../types/timeValues';
-import { IActionState } from '../../types/actionState';
-import { IActionWithState, ActionKey } from '../../types/actionWithState';
-import { CachedStateFactory } from '../cachedStateFactory';
-import { ChatContext } from '../context/chatContext';
-export declare class ScheduledAction<TActionState extends IActionState> implements IActionWithState {
-    static semaphore: Semaphore;
-    name: string;
-    timeinHours: HoursOfDay;
-    active: boolean;
-    chatsWhitelist: number[];
-    key: ActionKey;
-    cachedState: Map<string, unknown>;
-    stateConstructor: () => TActionState;
-    cachedStateFactories: Map<string, CachedStateFactory>;
-    handler: ScheduledHandler<TActionState>;
-    constructor(name: string, handler: ScheduledHandler<TActionState>, timeinHours: HoursOfDay, active: boolean, whitelist: number[], cachedStateFactories: Map<string, CachedStateFactory>, stateConstructor: () => TActionState);
-    exec(ctx: ChatContext<TActionState>): Promise<void>;
-    private getCachedValue;
-    private shouldTrigger;
-}
-//# sourceMappingURL=scheduledAction.d.ts.map

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

@@ -1 +0,0 @@
-{"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;IAE3B,MAAM,CAAC,SAAS,YAAoB;IAEpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;IAEf,WAAW,uBAA8B;IACzC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtD,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAGpC,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;YAmC3B,cAAc;IAqC5B,OAAO,CAAC,aAAa;CAaxB"}

package/dist/entities/actions/scheduledAction.js

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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("../actionExecutionResult");
-const logger_1 = require("../../services/logger");
-const taskScheduler_1 = require("../../services/taskScheduler");
-class ScheduledAction {
-    constructor(name, handler, timeinHours, active, whitelist, cachedStateFactories, stateConstructor) {
-        this.cachedState = new Map();
-        this.name = name;
-        this.handler = handler;
-        this.timeinHours = timeinHours;
-        this.active = active;
-        this.chatsWhitelist = whitelist;
-        this.cachedStateFactories = cachedStateFactories;
-        this.key = `scheduled:${this.name.replace('.', '-')}`;
-        this.stateConstructor = stateConstructor;
-    }
-    async exec(ctx) {
-        if (!this.active || !this.chatsWhitelist.includes(ctx.chatId))
-            return;
-        const state = await ctx.storage.getActionState(this, ctx.chatId);
-        const isAllowedToTrigger = this.shouldTrigger(state);
-        if (isAllowedToTrigger) {
-            logger_1.Logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatName, ` - Executing [${this.name}] in ${ctx.chatId}`);
-            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.chatId, new actionExecutionResult_1.ActionExecutionResult(state, isAllowedToTrigger));
-        }
-    }
-    async getCachedValue(key, botName) {
-        if (!this.cachedStateFactories.has(key)) {
-            throw new Error(`No shared cache was set up for the key [${key}] in action '${this.name}'`);
-        }
-        await ScheduledAction.semaphore.acquire();
-        try {
-            if (this.cachedState.has(key)) {
-                return this.cachedState.get(key);
-            }
-            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);
-            return value;
-        }
-        finally {
-            ScheduledAction.semaphore.release();
-        }
-    }
-    shouldTrigger(state) {
-        const startOfToday = (0, moment_1.default)().startOf('day').valueOf();
-        const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
-        const currentTime = (0, moment_1.default)();
-        const scheduledTime = (0, moment_1.default)()
-            .startOf('day')
-            .add(this.timeinHours, 'hours');
-        const isAllowedToTrigger = currentTime.isSameOrAfter(scheduledTime);
-        const hasTriggeredToday = lastExecutedDate.isAfter(startOfToday);
-        return isAllowedToTrigger && !hasTriggeredToday;
-    }
-}
-exports.ScheduledAction = ScheduledAction;
-ScheduledAction.semaphore = new async_sema_1.Sema(1);

package/dist/entities/botInstance.d.ts

@@ -1,31 +0,0 @@
-import { Seconds } from '../types/timeValues';
-import { IStorageClient } from '../types/storage';
-import { IActionState } from '../types/actionState';
-import { CommandAction } from './actions/commandAction';
-import { ScheduledAction } from './actions/scheduledAction';
-export declare class BotInstance {
-    name: string;
-    private api;
-    private telegraf;
-    private commands;
-    private scheduled;
-    private chats;
-    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;
-    });
-    private initializeScheduledProcessing;
-    private initializeMessageProcessing;
-    stop(code: string): Promise<void>;
-    private runScheduled;
-    private processMessage;
-}
-//# sourceMappingURL=botInstance.d.ts.map

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

@@ -1 +0,0 @@
-{"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;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,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;IAqCD,OAAO,CAAC,6BAA6B;IA2CrC,OAAO,CAAC,2BAA2B;IAiC7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}