chz-telegram-bot 0.3.11 → 0.3.12

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

@@ -5,7 +5,9 @@ import { IActionState } from '../../types/actionState';
 import { IActionWithState, ActionKey } from '../../types/action';
 import { MessageContext } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
+import { Sema as Semaphore } from 'async-sema';
 export declare class CommandAction<TActionState extends IActionState> implements IActionWithState<TActionState> {
+    readonly ratelimitSemaphores: Map<number, Semaphore>;
     readonly triggers: CommandTrigger[];
     readonly handler: CommandHandler<TActionState>;
     readonly name: string;
@@ -17,7 +19,8 @@ export declare class CommandAction<TActionState extends IActionState> implements
     readonly stateConstructor: () => TActionState;
     readonly key: ActionKey;
     readonly readmeFactory: (botName: string) => string;
-    constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldown: Seconds, chatsBlacklist: number[], allowedUsers: number[], condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
+    readonly maxAllowedSimultaniousExecutions: number;
+    constructor(trigger: CommandTrigger | CommandTrigger[], handler: CommandHandler<TActionState>, name: string, active: boolean, cooldown: Seconds, chatsBlacklist: number[], allowedUsers: number[], maxAllowedSimultaniousExecutions: number, condition: CommandCondition<TActionState>, stateConstructor: () => TActionState, readmeFactory: (botName: string) => string);
     exec(ctx: MessageContext<TActionState>): Promise<import("../../types/response").BotResponse[]>;
     private checkIfShouldBeExecuted;
     private checkTrigger;

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,oBAAoB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAI5D,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;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;gBAGhD,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,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAgBxC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IA+C5C,OAAO,CAAC,uBAAuB;IA+B/B,OAAO,CAAC,YAAY;CAuCvB"}
+{"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,oBAAoB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAG5D,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAG/C,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB,CAAC,YAAY,CAAC;IAEzC,QAAQ,CAAC,mBAAmB,yBAAgC;IAE5D,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;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,QAAQ,CAAC,gCAAgC,EAAE,MAAM,CAAC;gBAG9C,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,gCAAgC,EAAE,MAAM,EACxC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY,EACpC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAkBxC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IA8D5C,OAAO,CAAC,uBAAuB;IA+B/B,OAAO,CAAC,YAAY;CAuCvB"}

package/dist/entities/actions/commandAction.js

@@ -10,7 +10,10 @@ const toArray_1 = require("../../helpers/toArray");
 const commandTriggerCheckResult_1 = require("../../dtos/commandTriggerCheckResult");
 const noop_1 = require("../../helpers/noop");
 const messageTypes_1 = require("../../types/messageTypes");
+const async_sema_1 = require("async-sema");
+const mapUtils_1 = require("../../helpers/mapUtils");
 class CommandAction {
+    ratelimitSemaphores = new Map();
     triggers;
     handler;
     name;
@@ -22,7 +25,8 @@ class CommandAction {
     stateConstructor;
     key;
     readmeFactory;
-    constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, condition, stateConstructor, readmeFactory) {
+    maxAllowedSimultaniousExecutions;
+    constructor(trigger, handler, name, active, cooldown, chatsBlacklist, allowedUsers, maxAllowedSimultaniousExecutions, condition, stateConstructor, readmeFactory) {
         this.triggers = (0, toArray_1.toArray)(trigger);
         this.handler = handler;
         this.name = name;
@@ -33,6 +37,8 @@ class CommandAction {
         this.condition = condition;
         this.stateConstructor = stateConstructor;
         this.readmeFactory = readmeFactory;
+        this.maxAllowedSimultaniousExecutions =
+            maxAllowedSimultaniousExecutions;
         this.key = `command:${this.name.replace('.', '-')}`;
     }
     async exec(ctx) {
@@ -40,23 +46,33 @@ class CommandAction {
             throw new Error(`Context for ${this.key} is not initialized or already consumed`);
         if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
             return noop_1.Noop.NoResponse;
-        const state = await ctx.storage.getActionState(this, ctx.chatInfo.id);
-        const { shouldExecute, matchResults, skipCooldown } = this.triggers
-            .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
-            .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger);
-        if (!shouldExecute)
-            return noop_1.Noop.NoResponse;
-        ctx.logger.logWithTraceId(` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
-        ctx.matchResults = matchResults;
-        await this.handler(ctx, state);
-        if (skipCooldown) {
-            ctx.startCooldown = false;
+        let lock;
+        if (this.maxAllowedSimultaniousExecutions != 0) {
+            lock = (0, mapUtils_1.getOrSetIfNotExists)(this.ratelimitSemaphores, ctx.chatInfo.id, new async_sema_1.Sema(this.maxAllowedSimultaniousExecutions));
+            await lock.acquire();
+        }
+        try {
+            const state = await ctx.storage.getActionState(this, ctx.chatInfo.id);
+            const { shouldExecute, matchResults, skipCooldown } = this.triggers
+                .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
+                .reduce((acc, curr) => acc.mergeWith(curr), commandTriggerCheckResult_1.CommandTriggerCheckResult.DoNotTrigger);
+            if (!shouldExecute)
+                return noop_1.Noop.NoResponse;
+            ctx.logger.logWithTraceId(` - Executing [${this.name}] in ${ctx.chatInfo.id}`);
+            ctx.matchResults = matchResults;
+            await this.handler(ctx, state);
+            if (skipCooldown) {
+                ctx.startCooldown = false;
+            }
+            if (ctx.startCooldown) {
+                state.lastExecutedDate = (0, moment_1.default)().valueOf();
+            }
+            await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, state);
+            return ctx.responses;
         }
-        if (ctx.startCooldown) {
-            state.lastExecutedDate = (0, moment_1.default)().valueOf();
+        finally {
+            lock?.release();
         }
-        await ctx.storage.saveActionExecutionResult(this, ctx.chatInfo.id, state);
-        return ctx.responses;
     }
     checkIfShouldBeExecuted(ctx, trigger, state) {
         if (!ctx.fromUserId)

package/dist/helpers/builders/commandActionBuilder.d.ts

@@ -19,6 +19,7 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
     stateConstructor: () => TActionState;
     handler: CommandHandler<TActionState>;
     condition: CommandCondition<TActionState>;
+    maxAllowedSimultaniousExecutions: number;
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -47,6 +48,8 @@ export declare class CommandActionBuilderWithState<TActionState extends IActionS
     withHelp(readmeFactory: (botName: string) => string): this;
     /** If called during building, action is marked as disabled and never checked. */
     disabled(): this;
+    /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
+    ratelimit(maxAllowedSimultaniousExecutions: number): this;
     /** Sets action cooldown.
      * @param seconds Cooldown in seconds.
      */

package/dist/helpers/builders/commandActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,CAAM;IAEhD,MAAM,UAAQ;IACd,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,CAAQ;IAC3D,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAa;IAClD,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IAEtD;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAMzB;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,oBAAoB;IACpB,KAAK;CAcR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}
+{"version":3,"file":"commandActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/commandActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;GAEG;AACH,qBAAa,6BAA6B,CAAC,YAAY,SAAS,YAAY;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE,CAAM;IAEhD,MAAM,UAAQ;IACd,aAAa,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC,CAAQ;IAC3D,eAAe,EAAE,OAAO,CAAgB;IACxC,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAa;IAClD,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IACtD,gCAAgC,EAAE,MAAM,CAAK;IAE7C;;;;OAIG;gBACS,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D;;;;;OAKG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,cAAc,EAAE;IAM7C;;OAEG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAM1B;;OAEG;IACH,EAAE,CAAC,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC;IAMxC;;OAEG;IACH,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM9C,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAMnD,iFAAiF;IACjF,QAAQ;IAMR,qHAAqH;IACrH,SAAS,CAAC,gCAAgC,EAAE,MAAM;IAOlD;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO;IAMzB;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,oBAAoB;IACpB,KAAK;CAeR;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,6BAA6B,CAAC,eAAe,CAAC;IACpF;;OAEG;gBACS,IAAI,EAAE,MAAM;CAG3B"}

package/dist/helpers/builders/commandActionBuilder.js

@@ -19,6 +19,7 @@ class CommandActionBuilderWithState {
     stateConstructor;
     handler = noop_1.Noop.call;
     condition = noop_1.Noop.true;
+    maxAllowedSimultaniousExecutions = 0;
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
      * @param name Action name, will be used for logging and storage
@@ -68,6 +69,12 @@ class CommandActionBuilderWithState {
         this.active = false;
         return this;
     }
+    /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
+    ratelimit(maxAllowedSimultaniousExecutions) {
+        this.maxAllowedSimultaniousExecutions =
+            maxAllowedSimultaniousExecutions;
+        return this;
+    }
     /** Sets action cooldown.
      * @param seconds Cooldown in seconds.
      */
@@ -85,7 +92,7 @@ class CommandActionBuilderWithState {
     }
     /** Builds action */
     build() {
-        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, this.cooldownSeconds, this.blacklist, this.allowedUsers, this.condition, this.stateConstructor, this.readmeFactory != null ? this.readmeFactory : (_) => '');
+        return new commandAction_1.CommandAction(this.trigger, this.handler, this.name, this.active, this.cooldownSeconds, this.blacklist, this.allowedUsers, this.maxAllowedSimultaniousExecutions, this.condition, this.stateConstructor, this.readmeFactory != null ? this.readmeFactory : (_) => '');
     }
 }
 exports.CommandActionBuilderWithState = CommandActionBuilderWithState;

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -30,7 +30,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
                 cmd.triggers.includes(messageTypes_1.MessageType.Any));
         }
         if (commands.length > 0) {
-            telegraf.on('message', async (ctx) => {
+            telegraf.on('message', (ctx) => {
                 const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName);
                 const logger = this.logger.createScope(this.botName, msg.traceId, msg.chatInfo.name);
                 if (verboseLoggingForIncomingMessage) {
@@ -39,7 +39,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
                 else {
                     logger.logWithTraceId(`${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || `<non-text message: ${msg.type}>`}`);
                 }
-                await this.processMessage(msg);
+                void this.processMessage(msg);
             });
         }
     }

package/entities/actions/commandAction.ts

@@ -11,10 +11,14 @@ import { MessageContext } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Noop } from '../../helpers/noop';
 import { MessageType } from '../../types/messageTypes';
+import { Sema as Semaphore } from 'async-sema';
+import { getOrSetIfNotExists } from '../../helpers/mapUtils';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
 {
+    readonly ratelimitSemaphores = new Map<number, Semaphore>();
+
     readonly triggers: CommandTrigger[];
     readonly handler: CommandHandler<TActionState>;
     readonly name: string;
@@ -26,6 +30,7 @@ export class CommandAction<TActionState extends IActionState>
     readonly stateConstructor: () => TActionState;
     readonly key: ActionKey;
     readonly readmeFactory: (botName: string) => string;
+    readonly maxAllowedSimultaniousExecutions: number;
 
     constructor(
         trigger: CommandTrigger | CommandTrigger[],
@@ -35,6 +40,7 @@ export class CommandAction<TActionState extends IActionState>
         cooldown: Seconds,
         chatsBlacklist: number[],
         allowedUsers: number[],
+        maxAllowedSimultaniousExecutions: number,
         condition: CommandCondition<TActionState>,
         stateConstructor: () => TActionState,
         readmeFactory: (botName: string) => string
@@ -49,6 +55,8 @@ export class CommandAction<TActionState extends IActionState>
         this.condition = condition;
         this.stateConstructor = stateConstructor;
         this.readmeFactory = readmeFactory;
+        this.maxAllowedSimultaniousExecutions =
+            maxAllowedSimultaniousExecutions;
 
         this.key = `command:${this.name.replace('.', '-')}` as ActionKey;
     }
@@ -62,42 +70,57 @@ export class CommandAction<TActionState extends IActionState>
         if (!this.active || this.chatsBlacklist.includes(ctx.chatInfo.id))
             return Noop.NoResponse;
 
-        const state = await ctx.storage.getActionState<TActionState>(
-            this,
-            ctx.chatInfo.id
-        );
+        let lock: Semaphore | undefined;
+        if (this.maxAllowedSimultaniousExecutions != 0) {
+            lock = getOrSetIfNotExists(
+                this.ratelimitSemaphores,
+                ctx.chatInfo.id,
+                new Semaphore(this.maxAllowedSimultaniousExecutions)
+            );
+
+            await lock.acquire();
+        }
 
-        const { shouldExecute, matchResults, skipCooldown } = this.triggers
-            .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
-            .reduce(
-                (acc, curr) => acc.mergeWith(curr),
-                CommandTriggerCheckResult.DoNotTrigger
+        try {
+            const state = await ctx.storage.getActionState<TActionState>(
+                this,
+                ctx.chatInfo.id
             );
 
-        if (!shouldExecute) return Noop.NoResponse;
+            const { shouldExecute, matchResults, skipCooldown } = this.triggers
+                .map((x) => this.checkIfShouldBeExecuted(ctx, x, state))
+                .reduce(
+                    (acc, curr) => acc.mergeWith(curr),
+                    CommandTriggerCheckResult.DoNotTrigger
+                );
 
-        ctx.logger.logWithTraceId(
-            ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
-        );
-        ctx.matchResults = matchResults;
+            if (!shouldExecute) return Noop.NoResponse;
 
-        await this.handler(ctx, state);
+            ctx.logger.logWithTraceId(
+                ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
+            );
+            ctx.matchResults = matchResults;
 
-        if (skipCooldown) {
-            ctx.startCooldown = false;
-        }
+            await this.handler(ctx, state);
 
-        if (ctx.startCooldown) {
-            state.lastExecutedDate = moment().valueOf();
-        }
+            if (skipCooldown) {
+                ctx.startCooldown = false;
+            }
 
-        await ctx.storage.saveActionExecutionResult(
-            this,
-            ctx.chatInfo.id,
-            state
-        );
+            if (ctx.startCooldown) {
+                state.lastExecutedDate = moment().valueOf();
+            }
 
-        return ctx.responses;
+            await ctx.storage.saveActionExecutionResult(
+                this,
+                ctx.chatInfo.id,
+                state
+            );
+
+            return ctx.responses;
+        } finally {
+            lock?.release();
+        }
     }
 
     private checkIfShouldBeExecuted(

package/helpers/builders/commandActionBuilder.ts

@@ -23,6 +23,7 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
     stateConstructor: () => TActionState;
     handler: CommandHandler<TActionState> = Noop.call;
     condition: CommandCondition<TActionState> = Noop.true;
+    maxAllowedSimultaniousExecutions: number = 0;
 
     /**
      * Builder for `CommandAction` with state represented by `TActionState`
@@ -86,6 +87,14 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
         return this;
     }
 
+    /** Sets maximum number of simultaniously executing handlers for this command per chat. 0 is treated as unlimited. */
+    ratelimit(maxAllowedSimultaniousExecutions: number) {
+        this.maxAllowedSimultaniousExecutions =
+            maxAllowedSimultaniousExecutions;
+
+        return this;
+    }
+
     /** Sets action cooldown.
      * @param seconds Cooldown in seconds.
      */
@@ -115,6 +124,7 @@ export class CommandActionBuilderWithState<TActionState extends IActionState> {
             this.cooldownSeconds,
             this.blacklist,
             this.allowedUsers,
+            this.maxAllowedSimultaniousExecutions,
             this.condition,
             this.stateConstructor,
             this.readmeFactory != null ? this.readmeFactory : (_) => ''

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.3.11",
+    "version": "0.3.12",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/actionProcessors/commandActionProcessor.ts

@@ -60,7 +60,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
         }
 
         if (commands.length > 0) {
-            telegraf.on('message', async (ctx) => {
+            telegraf.on('message', (ctx) => {
                 const msg = new IncomingMessage(
                     ctx.update.message,
                     this.botName
@@ -82,7 +82,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
                     );
                 }
 
-                await this.processMessage(msg);
+                void this.processMessage(msg);
             });
         }
     }