chz-telegram-bot 0.3.10 → 0.3.12

package/dist/services/responseProcessingQueue.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseProcessingQueue = void 0;
 const async_sema_1 = require("async-sema");
+function notEmpty(arr) {
+    return arr.length > 0;
+}
 const TELEGRAM_RATELIMIT_DELAY = 35;
 class ResponseProcessingQueue {
-    constructor() {
-        this.rateLimiter = (0, async_sema_1.RateLimit)(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
-        this.items = [];
-        this.isFlushing = false;
-    }
+    rateLimiter = (0, async_sema_1.RateLimit)(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
+    items = [];
+    isFlushing = false;
     enqueue(item) {
         if (this.items.length === 0 ||
             item.priority >= this.items[this.items.length - 1].priority) {
@@ -26,10 +27,11 @@ class ResponseProcessingQueue {
         if (this.isFlushing)
             return;
         this.isFlushing = true;
-        while (this.items.length) {
+        while (notEmpty(this.items)) {
             if (Date.now() >= this.items[0].priority) {
                 await this.rateLimiter();
-                const item = this.items.shift();
+                const [item] = this.items;
+                this.items.shift();
                 await item.callback();
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAKlC;IAEV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,2BAA2B,EAAE,CACzB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,KACf,IAAI;IASb,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAsDhD,cAAc;YAIA,WAAW;YAkBX,eAAe;CAoGhC"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAKlC;IAEV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,2BAA2B,EAAE,CACzB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,KACf,IAAI;IASb,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAsDhD,cAAc;YAIA,WAAW;YAkBX,eAAe;CAsGhC"}

package/dist/services/telegramApi.js

@@ -4,8 +4,13 @@ exports.TelegramApiService = exports.TELEGRAM_ERROR_QUOTE_INVALID = void 0;
 const responseProcessingQueue_1 = require("./responseProcessingQueue");
 exports.TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
 class TelegramApiService {
+    queue = new responseProcessingQueue_1.ResponseProcessingQueue();
+    telegram;
+    storage;
+    logger;
+    captureRegistrationCallback;
+    botName;
     constructor(botName, telegram, storage, logger, captureRegistrationCallback) {
-        this.queue = new responseProcessingQueue_1.ResponseProcessingQueue();
         this.telegram = telegram;
         this.botName = botName;
         this.storage = storage;
@@ -50,12 +55,12 @@ class TelegramApiService {
         }
     }
     flushResponses() {
-        this.queue.flushReadyItems();
+        void this.queue.flushReadyItems();
     }
     async pinIfShould(response, sentMessage) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(response.chatInfo.id, sentMessage.message_id, { disable_notification: true });
-            await this.storage.updateStateFor(response.action, response.chatInfo.id, async (state) => {
+            await this.storage.updateStateFor(response.action, response.chatInfo.id, (state) => {
                 state.pinnedMessages.push(sentMessage.message_id);
             });
         }
@@ -80,16 +85,20 @@ class TelegramApiService {
                 });
                 break;
             case 'image':
-                sentMessage = await this.telegram.sendPhoto(response.chatInfo.id, response.content, response.replyInfo?.id
+                sentMessage = await this.telegram.sendPhoto(response.chatInfo.id, response.content, 
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                response.replyInfo?.id
                     ? {
-                        reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     }
                     : undefined);
                 break;
             case 'video':
-                sentMessage = await this.telegram.sendVideo(response.chatInfo.id, response.content, response.replyInfo?.id
+                sentMessage = await this.telegram.sendVideo(response.chatInfo.id, response.content, 
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                response.replyInfo?.id
                     ? {
-                        reply_to_message_id: response.replyInfo?.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     }
                     : undefined);
                 break;
@@ -103,7 +112,7 @@ class TelegramApiService {
                 return;
             case 'unpin':
                 await this.telegram.unpinChatMessage(response.chatInfo.id, response.messageId);
-                await this.storage.updateStateFor(response.action, response.chatInfo.id, async (state) => {
+                await this.storage.updateStateFor(response.action, response.chatInfo.id, (state) => {
                     state.pinnedMessages = state.pinnedMessages.filter((x) => x != response.messageId);
                 });
                 break;

package/dist/types/commandTrigger.d.ts

@@ -1,3 +1,2 @@
-import { MessageTypeValue } from './messageTypes';
-export type CommandTrigger = MessageTypeValue | string | RegExp;
+export type CommandTrigger = string | RegExp;
 //# sourceMappingURL=commandTrigger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandTrigger.d.ts","sourceRoot":"","sources":["../../types/commandTrigger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC"}
+{"version":3,"file":"commandTrigger.d.ts","sourceRoot":"","sources":["../../types/commandTrigger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC"}

package/dist/types/handlers.d.ts

@@ -10,7 +10,7 @@ export type CommandHandler<TActionState extends IActionState> = (
 /** Context of action executed in chat, in response to a message. */
 ctx: MessageContext<TActionState>, 
 /** State of an action being executed. */
-state: TActionState) => Promise<void>;
+state: TActionState) => Promise<void> | void;
 export type ScheduledHandler<TActionState extends IActionState> = (
 /** Context of action executed in chat. */
 ctx: ChatContext<TActionState>, 

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

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAAG;AAC7B,0EAA0E;AAC1E,GAAG,EAAE,kBAAkB,KACtB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI;AAC5D,oEAAoE;AACpE,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;AACjC,yCAAyC;AACzC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI;AAC9D,0CAA0C;AAC1C,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;AAC9B,yIAAyI;AACzI,SAAS,EAAE,mBAAmB;AAC9B,yCAAyC;AACzC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAAG;AAC7B,0EAA0E;AAC1E,GAAG,EAAE,kBAAkB,KACtB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI;AAC5D,oEAAoE;AACpE,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;AACjC,yCAAyC;AACzC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE1B,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI;AAC9D,0CAA0C;AAC1C,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;AAC9B,yIAAyI;AACzI,SAAS,EAAE,mBAAmB;AAC9B,yCAAyC;AACzC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/types/logger.d.ts

@@ -2,12 +2,12 @@ import { TraceId } from './trace';
 export interface IScopedLogger {
     logObjectWithTraceId(data: any): void;
     logWithTraceId(text: string): void;
-    errorWithTraceId<TData>(errorObj: unknown, extraData?: TData | undefined): void;
+    errorWithTraceId(errorObj: unknown, extraData?: unknown): void;
 }
 export interface ILogger {
     createScope(botName: string, traceId: TraceId, chatName: string): IScopedLogger;
     logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: any): void;
     logWithTraceId(botName: string, traceId: TraceId, chatName: string, text: string): void;
-    errorWithTraceId<TData>(botName: string, traceId: TraceId, chatName: string, errorObj: unknown, extraData?: TData | undefined): void;
+    errorWithTraceId(botName: string, traceId: TraceId, chatName: string, errorObj: unknown, extraData?: unknown): void;
 }
 //# sourceMappingURL=logger.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,WAAW,aAAa;IAC1B,oBAAoB,CAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,gBAAgB,CAAC,KAAK,EAClB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,GAC9B,IAAI,CAAC;CACX;AAED,MAAM,WAAW,OAAO;IACpB,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,GACjB,aAAa,CAAC;IAEjB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,GAC9B,IAAI,CAAC;CACX"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,WAAW,aAAa;IAC1B,oBAAoB,CAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,OAAO;IACpB,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,GACjB,aAAa,CAAC;IAEjB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC;CACX"}

package/dist/types/scheduler.d.ts

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

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

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

package/dist/types/storage.d.ts

@@ -1,9 +1,9 @@
 import { IActionState } from './actionState';
 import { ActionKey, IActionWithState } from './action';
 export interface IStorageClient {
-    updateStateFor<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
+    updateStateFor<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, update: (state: TActionState) => Promise<void> | void): Promise<void>;
     close(): Promise<void>;
-    load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
+    load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState | undefined>>;
     saveMetadata<TActionState extends IActionState>(actions: IActionWithState<TActionState>[]): Promise<void>;
     getActionState<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number): Promise<TActionState>;
     saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, state: TActionState): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,GAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GACtD,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC;IACrD,YAAY,CAAC,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,GAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/dist/types/timeValues.d.ts

@@ -2,13 +2,13 @@ declare const millisecondsSymbol: unique symbol;
 declare const secondsSymbol: unique symbol;
 declare const hoursSymbol: unique symbol;
 export type Milliseconds = number & {
-    [millisecondsSymbol]: void;
+    [millisecondsSymbol]: never;
 };
 export type Seconds = number & {
-    [secondsSymbol]: void;
+    [secondsSymbol]: never;
 };
 export type Hours = number & {
-    [hoursSymbol]: void;
+    [hoursSymbol]: never;
 };
 export type HoursOfDay = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"timeValues.d.ts","sourceRoot":"","sources":["../../types/timeValues.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,kBAAkB,EAAE,OAAO,MAAM,CAAC;AAChD,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AACnE,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAErD,MAAM,MAAM,UAAU,GAChB,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,CAAC"}
+{"version":3,"file":"timeValues.d.ts","sourceRoot":"","sources":["../../types/timeValues.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,kBAAkB,EAAE,OAAO,MAAM,CAAC;AAChD,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AAEzC,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG;IAAE,CAAC,kBAAkB,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AACpE,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAC1D,MAAM,MAAM,KAAK,GAAG,MAAM,GAAG;IAAE,CAAC,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAEtD,MAAM,MAAM,UAAU,GAChB,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,CAAC,GACD,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,GACF,EAAE,CAAC"}

package/dist/types/trace.d.ts

@@ -1,6 +1,6 @@
 declare const traceSymbol: unique symbol;
 export type TraceId = `${string}:${string}-${string}` & {
-    [traceSymbol]: void;
+    [traceSymbol]: never;
 };
 export {};
 //# sourceMappingURL=trace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../types/trace.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AAEzC,MAAM,MAAM,OAAO,GAAG,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAAG;IAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC"}
+{"version":3,"file":"trace.d.ts","sourceRoot":"","sources":["../../types/trace.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AAEzC,MAAM,MAAM,OAAO,GAAG,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAAG;IACpD,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;CACxB,CAAC"}

package/dtos/incomingMessage.ts

@@ -61,7 +61,7 @@ export class IncomingMessage {
         this.chatInfo = new ChatInfo(
             ctxMessage.chat.id,
             'title' in ctxMessage.chat
-                ? ctxMessage.chat.title + ' ' + ctxMessage.chat.id
+                ? `${ctxMessage.chat.title} ${ctxMessage.chat.id}`
                 : 'DM'
         );
         this.type = this.detectMessageType(ctxMessage);

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();
+            }
+
+            await ctx.storage.saveActionExecutionResult(
+                this,
+                ctx.chatInfo.id,
+                state
+            );
 
-        return ctx.responses;
+            return ctx.responses;
+        } finally {
+            lock?.release();
+        }
     }
 
     private checkIfShouldBeExecuted(
@@ -149,13 +172,17 @@ export class CommandAction<TActionState extends IActionState>
 
         const execResult = trigger.exec(ctx.messageText);
         if (execResult != null) {
+            let regexMatchLimit = 100;
             matchResults.push(execResult);
 
             if (trigger.global) {
-                while (true) {
+                while (regexMatchLimit > 0) {
                     const nextResult = trigger.exec(ctx.messageText);
+
                     if (nextResult == null) break;
+
                     matchResults.push(nextResult);
+                    regexMatchLimit -= 1;
                 }
             }
         }

package/entities/actions/inlineQueryAction.ts

@@ -38,13 +38,17 @@ export class InlineQueryAction implements IAction {
 
         const execResult = this.pattern.exec(ctx.queryText);
         if (execResult != null) {
+            let regexMatchLimit = 100;
             matchResults.push(execResult);
 
             if (this.pattern.global) {
-                while (true) {
+                while (regexMatchLimit > 0) {
                     const nextResult = this.pattern.exec(ctx.queryText);
+
                     if (nextResult == null) break;
+
                     matchResults.push(nextResult);
+                    regexMatchLimit -= 1;
                 }
             }
         }

package/entities/actions/replyCaptureAction.ts

@@ -81,13 +81,17 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
 
         const execResult = trigger.exec(ctx.messageText);
         if (execResult != null) {
+            let regexMatchLimit = 100;
             matchResults.push(execResult);
 
             if (trigger.global) {
-                while (true) {
+                while (regexMatchLimit > 0) {
                     const nextResult = trigger.exec(ctx.messageText);
+
                     if (nextResult == null) break;
+
                     matchResults.push(nextResult);
+                    regexMatchLimit -= 1;
                 }
             }
         }

package/entities/actions/scheduledAction.ts

@@ -9,6 +9,7 @@ import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
 import { Noop } from '../../helpers/noop';
 import { IScheduler } from '../../types/scheduler';
+import { getOrSetIfNotExists, getOrThrow } from '../../helpers/mapUtils';
 
 export class ScheduledAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -89,20 +90,18 @@ export class ScheduledAction<TActionState extends IActionState>
         botName: string,
         scheduler: IScheduler
     ): Promise<TResult> {
-        if (!this.cachedStateFactories.has(key)) {
-            throw new Error(
-                `No shared cache was set up for the key [${key}] in action '${this.name}'`
-            );
-        }
+        const cachedItemFactory = getOrThrow(
+            this.cachedStateFactories,
+            key,
+            `No shared cache was set up for the key [${key}] in action '${this.name}'`
+        );
 
         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);
-        }
+        const semaphore = getOrSetIfNotExists(
+            ScheduledAction.locks,
+            semaphoreKey,
+            new Semaphore(1)
+        );
 
         await semaphore.acquire();
 
@@ -111,7 +110,6 @@ export class ScheduledAction<TActionState extends IActionState>
                 return this.cachedState.get(key) as TResult;
             }
 
-            const cachedItemFactory = this.cachedStateFactories.get(key)!;
             const value = await cachedItemFactory.getValue();
 
             this.cachedState.set(key, value);

package/entities/botInstance.ts

@@ -68,19 +68,19 @@ export class BotInstance {
         scheduledPeriod?: Seconds,
         verboseLoggingForIncomingMessage?: boolean
     ) {
-        this.actionProcessingService.initialize(
-            token,
-            actions,
-            scheduledPeriod,
-            verboseLoggingForIncomingMessage
-        );
-
         this.logger.logWithTraceId(
             this.name,
             createTrace(this, this.name, 'Start'),
             'System',
             'Starting bot...'
         );
+
+        await this.actionProcessingService.initialize(
+            token,
+            actions,
+            scheduledPeriod,
+            verboseLoggingForIncomingMessage
+        );
     }
 
     async stop(code: string) {

package/entities/context/chatContext.ts

@@ -1,5 +1,4 @@
 import { resolve } from 'path';
-import { IStorageClient } from '../../types/storage';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { VideoMessage } from '../../dtos/responses/videoMessage';
@@ -13,7 +12,6 @@ import { IActionState } from '../../types/actionState';
 import { IReplyResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { DelayResponse } from '../../dtos/responses/delay';
-import { IScheduler } from '../../types/scheduler';
 import { ICaptureController } from '../../types/capture';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { ReplyContext } from './replyContext';
@@ -27,10 +25,6 @@ export class ChatContext<
     TActionState extends IActionState,
     TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>
 > extends BaseContext<TAction> {
-    constructor(storage: IStorageClient, scheduler: IScheduler) {
-        super(storage, scheduler);
-    }
-
     protected createCaptureController(
         response: IReplyResponse
     ): ICaptureController {

package/entities/context/inlineQueryContext.ts

@@ -1,7 +1,5 @@
 import { InlineQueryResult } from 'telegraf/types';
 import { BotResponse } from '../../types/response';
-import { IScheduler } from '../../types/scheduler';
-import { IStorageClient } from '../../types/storage';
 import { InlineQueryAction } from '../actions/inlineQueryAction';
 import { InlineQueryResponse } from '../../dtos/responses/inlineQueryResponse';
 import { BaseContext } from './baseContext';
@@ -32,10 +30,6 @@ export class InlineQueryContext extends BaseContext<InlineQueryAction> {
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults: RegExpMatchArray[] = [];
 
-    constructor(storage: IStorageClient, scheduler: IScheduler) {
-        super(storage, scheduler);
-    }
-
     /**
      * This result will be shown to user as a response to inline query.
      * @param queryResult Inline query result to be shown to user.

package/entities/context/messageContext.ts

@@ -1,6 +1,5 @@
 import { resolve } from 'path';
 import { TelegramEmoji } from 'telegraf/types';
-import { IStorageClient } from '../../types/storage';
 import { IActionState } from '../../types/actionState';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
@@ -15,7 +14,6 @@ import {
     MessageTypeValue,
     TelegrafContextMessage
 } from '../../types/messageTypes';
-import { IScheduler } from '../../types/scheduler';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { CommandAction } from '../actions/commandAction';
 
@@ -42,10 +40,6 @@ export class MessageContext<
     /** Message object recieved from Telegram */
     messageUpdateObject!: TelegrafContextMessage;
 
-    constructor(storage: IStorageClient, scheduler: IScheduler) {
-        super(storage, scheduler);
-    }
-
     private getQuotePart(quote: boolean | string) {
         return typeof quote == 'boolean'
             ? this.matchResults.length != 0