chz-telegram-bot 0.0.42 → 0.0.44

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;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"}
+{"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;IAkD5C,OAAO,CAAC,YAAY;CAwDvB"}

package/dist/entities/actions/commandAction.js

@@ -24,6 +24,8 @@ class CommandAction {
         this.key = `command:${this.name.replace('.', '-')}`;
     }
     async exec(ctx) {
+        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/dist/entities/actions/scheduledAction.d.ts

@@ -6,7 +6,7 @@ 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;
+    static locks: Map<string, Semaphore>;
     name: string;
     timeinHours: HoursOfDay;
     active: boolean;

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;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"}
+{"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,KAAK,yBAAgC;IAE5C,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;YAqC3B,cAAc;IA8C5B,OAAO,CAAC,aAAa;CAaxB"}

package/dist/entities/actions/scheduledAction.js

@@ -23,6 +23,8 @@ class ScheduledAction {
         this.stateConstructor = stateConstructor;
     }
     async exec(ctx) {
+        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(this, ctx.chatId);
@@ -39,7 +41,16 @@ class ScheduledAction {
         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();
+        const semaphoreKey = `${this.key}_cached:${key}`;
+        let semaphore;
+        if (ScheduledAction.locks.has(semaphoreKey)) {
+            semaphore = ScheduledAction.locks.get(semaphoreKey);
+        }
+        else {
+            semaphore = new async_sema_1.Sema(1);
+            ScheduledAction.locks.set(semaphoreKey, semaphore);
+        }
+        await semaphore.acquire();
         try {
             if (this.cachedState.has(key)) {
                 return this.cachedState.get(key);
@@ -51,7 +62,7 @@ class ScheduledAction {
             return value;
         }
         finally {
-            ScheduledAction.semaphore.release();
+            semaphore.release();
         }
     }
     shouldTrigger(state) {
@@ -67,4 +78,4 @@ class ScheduledAction {
     }
 }
 exports.ScheduledAction = ScheduledAction;
-ScheduledAction.semaphore = new async_sema_1.Sema(1);
+ScheduledAction.locks = new Map();

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;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"}
+{"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;AAQ5D,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;YAwBZ,cAAc;CAqB/B"}

package/dist/entities/botInstance.js

@@ -12,6 +12,8 @@ const logger_1 = require("../services/logger");
 const taskScheduler_1 = require("../services/taskScheduler");
 const incomingMessage_1 = require("./incomingMessage");
 const moment_1 = __importDefault(require("moment"));
+const chatContext_1 = require("./context/chatContext");
+const messageContext_1 = require("./context/messageContext");
 class BotInstance {
     constructor(options) {
         this.name = options.name;
@@ -74,9 +76,10 @@ class BotInstance {
         this.telegraf.stop(code);
     }
     async runScheduled() {
+        const ctx = new chatContext_1.ChatContext();
         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);
                 }
@@ -88,8 +91,9 @@ class BotInstance {
         await this.api.flushResponses();
     }
     async processMessage(msg) {
+        const ctx = new messageContext_1.MessageContext();
         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/dist/entities/context/chatContext.d.ts

@@ -19,7 +19,9 @@ export declare class ChatContext<TActionState> {
     chatName: string;
     /** Storage client instance for this bot. */
     storage: IStorageClient;
-    constructor(botName: string, action: IActionWithState, interactions: IBotApiInteractions, chatId: number, chatName: string, traceId: number | string, storage: IStorageClient);
+    isInitialized: boolean;
+    constructor();
+    initializeChatContext(botName: string, action: IActionWithState, interactions: IBotApiInteractions, chatId: number, chatName: string, traceId: number | string, storage: IStorageClient): this;
     /**
      * Manually update the state of an action.
      * @param stateUpdateAction Function that will modify state.

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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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;AAE/D;;GAEG;AACH,qBAAa,WAAW,CAAC,YAAY;IACjC,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC;IACnC,SAAS,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC5C,aAAa,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,CAAM;IACzD,sCAAsC;IACtC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,cAAc;IAW3B;;;OAGG;IACH,WAAW,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;IAI5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAahE;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;CAKjC"}
+{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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;AAE/D;;GAEG;AACH,qBAAa,WAAW,CAAC,YAAY;IACjC,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC;IACpC,SAAS,CAAC,YAAY,EAAG,mBAAmB,CAAC;IAC7C,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,+CAA+C;IAC/C,MAAM,EAAG,MAAM,CAAC;IAChB,iDAAiD;IACjD,QAAQ,EAAG,MAAM,CAAC;IAClB,4CAA4C;IAC5C,OAAO,EAAG,cAAc,CAAC;IAEzB,aAAa,UAAS;;IAItB,qBAAqB,CACjB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,cAAc;IAgB3B;;;OAGG;IACH,WAAW,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;IAI5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAahE;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;;OAIG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;CAKjC"}

package/dist/entities/context/chatContext.js

@@ -10,8 +10,11 @@ const unpin_1 = require("../responses/unpin");
  * Context of action executed in chat.
  */
 class ChatContext {
-    constructor(botName, action, interactions, chatId, chatName, traceId, storage) {
+    constructor() {
         this.updateActions = [];
+        this.isInitialized = false;
+    }
+    initializeChatContext(botName, action, interactions, chatId, chatName, traceId, storage) {
         this.botName = botName;
         this.action = action;
         this.interactions = interactions;
@@ -19,6 +22,9 @@ class ChatContext {
         this.chatName = chatName;
         this.traceId = traceId;
         this.storage = storage;
+        this.updateActions = [];
+        this.isInitialized = true;
+        return this;
     }
     /**
      * Manually update the state of an action.

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

@@ -6,7 +6,7 @@ import { ChatContext } from './chatContext';
 import { IncomingMessage } from '../incomingMessage';
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/actionWithState';
-import { MessageType } from '../../types/messageTypes';
+import { MessageTypeValue } from '../../types/messageTypes';
 /**
  * Context of action executed in chat, in response to a message
  */
@@ -24,8 +24,9 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     /** Name of a user that sent a message that triggered this action. */
     fromUserName: string;
     /** Type of message being received */
-    messageType: (typeof MessageType)[keyof typeof MessageType];
-    constructor(botName: string, action: IActionWithState, interactions: IBotApiInteractions, message: IncomingMessage, storage: IStorageClient);
+    messageType: MessageTypeValue;
+    constructor();
+    initializeMessageContext(botName: string, action: IActionWithState, interactions: IBotApiInteractions, message: IncomingMessage, storage: IStorageClient): 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,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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,oBAAoB,CAAC;AACrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAa,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD;;GAEG;AACH,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/B,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,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,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,WAAW,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;gBAGxD,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc;IAqB3B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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,oBAAoB,CAAC;AACrD,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;AAE5D;;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,EACxB,YAAY,EAAE,mBAAmB,EACjC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,cAAc;IAwB3B;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAe/B;;;;OAIG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;;OAIG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D;;;OAGG;IACH,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}

package/dist/entities/context/messageContext.js

@@ -12,12 +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(botName, action, interactions, message, storage) {
-        super(botName, action, interactions, message.chat.id, message.chatName, message.traceId, storage);
+    constructor() {
+        super();
         /** 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, interactions, message, storage) {
         this.messageId = message.message_id;
         this.messageText = message.text ?? '';
         this.messageType = message.type;
@@ -25,6 +27,9 @@ class MessageContext extends chatContext_1.ChatContext {
         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, message.chat.id, message.chatName, message.traceId, storage);
     }
     /**
      * Loads state of another action. Changes to the loaded state will no affect actual state of other action.

package/dist/entities/incomingMessage.d.ts

@@ -1,12 +1,12 @@
 import { Chat, Message, Update, User } from 'telegraf/types';
-import { MessageType } from '../types/messageTypes';
+import { MessageTypeValue } from '../types/messageTypes';
 export declare class IncomingMessage {
     message_id: number;
     chat: Chat;
     from: User | undefined;
     text: string;
     chatName: string;
-    type: (typeof MessageType)[keyof typeof MessageType];
+    type: MessageTypeValue;
     traceId: number;
     private detectMessageType;
     constructor(ctxMessage: Update.New & (Update.NonChannel & Message));

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

@@ -1 +1 @@
-{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../entities/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,qBAAa,eAAe;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;IACrD,OAAO,SAA2B;IAElC,OAAO,CAAC,iBAAiB;gBAgBb,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;CAWrE"}
+{"version":3,"file":"incomingMessage.d.ts","sourceRoot":"","sources":["../../entities/incomingMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE7D,OAAO,EAAe,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,qBAAa,eAAe;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,IAAI,CAAC;IACX,IAAI,EAAE,IAAI,GAAG,SAAS,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,SAA2B;IAElC,OAAO,CAAC,iBAAiB;gBAiBb,UAAU,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;CAWrE"}

package/dist/entities/incomingMessage.js

@@ -5,16 +5,18 @@ const crypto_1 = require("crypto");
 const messageTypes_1 = require("../types/messageTypes");
 class IncomingMessage {
     detectMessageType(message) {
+        if ('photo' in message)
+            return messageTypes_1.MessageType.Photo;
         if ('sticker' in message)
             return messageTypes_1.MessageType.Sticker;
         if ('animation' in message)
             return messageTypes_1.MessageType.Animation;
-        if ('document' in message)
-            return messageTypes_1.MessageType.Document;
         if ('voice' in message)
             return messageTypes_1.MessageType.Voice;
         if ('audio' in message)
             return messageTypes_1.MessageType.Audio;
+        if ('document' in message)
+            return messageTypes_1.MessageType.Document;
         if ('left_chat_member' in message)
             return messageTypes_1.MessageType.LeftChatMember;
         if ('new_chat_member' in message)

package/dist/services/telegramApi.d.ts

@@ -25,8 +25,8 @@ export declare class TelegramApiService {
     private pinIfShould;
     private processResponse;
     private enqueue;
-    createContextForMessage<TActionState extends IActionState>(incomingMessage: IncomingMessage, command: CommandAction<TActionState>): MessageContext<TActionState>;
-    createContextForChat<TActionState extends IActionState>(chatId: number, scheduledAction: ScheduledAction<TActionState>): ChatContext<TActionState>;
+    initializeContextForMessage<TActionState extends IActionState>(ctx: MessageContext<TActionState>, incomingMessage: IncomingMessage, command: CommandAction<TActionState>): MessageContext<TActionState>;
+    initializeContextForChat<TActionState extends IActionState>(ctx: ChatContext<TActionState>, chatId: number, scheduledAction: ScheduledAction<TActionState>): ChatContext<TActionState>;
 }
 export interface IBotApiInteractions {
     respond: (response: TextMessage | VideoMessage | ImageMessage) => void;

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,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,WAAW,EAAE,CAAM;IAEjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,mBAAmB,CAAC;gBAG9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAc3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,uBAAuB,CAAC,YAAY,SAAS,YAAY,EACrD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAWxC,oBAAoB,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,KAAK,IAAI,CAAC;IACvE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,WAAW,EAAE,CAAM;IAEjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;IACxB,YAAY,EAAE,mBAAmB,CAAC;gBAG9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAc3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,2BAA2B,CAAC,YAAY,SAAS,YAAY,EACzD,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAWxC,wBAAwB,CAAC,YAAY,SAAS,YAAY,EACtD,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,KAAK,IAAI,CAAC;IACvE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD"}

package/dist/services/telegramApi.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelegramApiService = void 0;
-const chatContext_1 = require("../entities/context/chatContext");
-const messageContext_1 = require("../entities/context/messageContext");
 const inverseRecord_1 = require("../helpers/inverseRecord");
 const logger_1 = require("./logger");
 const promises_1 = require("timers/promises");
@@ -92,11 +90,11 @@ class TelegramApiService {
     enqueue(response) {
         this.messageQueue.push(response);
     }
-    createContextForMessage(incomingMessage, command) {
-        return new messageContext_1.MessageContext(this.botName, command, this.interactions, incomingMessage, this.storage);
+    initializeContextForMessage(ctx, incomingMessage, command) {
+        return ctx.initializeMessageContext(this.botName, command, this.interactions, incomingMessage, this.storage);
     }
-    createContextForChat(chatId, scheduledAction) {
-        return new chatContext_1.ChatContext(this.botName, scheduledAction, this.interactions, chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
+    initializeContextForChat(ctx, chatId, scheduledAction) {
+        return ctx.initializeChatContext(this.botName, scheduledAction, this.interactions, chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
     }
 }
 exports.TelegramApiService = TelegramApiService;

package/dist/types/commandTrigger.d.ts

@@ -1,3 +1,3 @@
-import { MessageType } from './messageTypes';
-export type CommandTrigger = (typeof MessageType)[keyof typeof MessageType] | string | RegExp;
+import { MessageTypeValue } from './messageTypes';
+export type CommandTrigger = MessageTypeValue | 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,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,MAAM,MAAM,cAAc,GACpB,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,GAC9C,MAAM,GACN,MAAM,CAAC"}
+{"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"}

package/dist/types/messageTypes.d.ts

@@ -9,6 +9,8 @@ export declare const MessageType: {
     readonly NewChatMember: "__msg:NewChatMember";
     readonly Poll: "__msg:Poll";
     readonly Location: "__msg:Location";
+    readonly Photo: "__msg:Photo";
     readonly Unknown: "__msg:Unknown";
 };
+export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];
 //# sourceMappingURL=messageTypes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;CAYd,CAAC"}
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;;CAad,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC"}

package/dist/types/messageTypes.js

@@ -12,5 +12,6 @@ exports.MessageType = {
     NewChatMember: '__msg:NewChatMember',
     Poll: '__msg:Poll',
     Location: '__msg:Location',
+    Photo: '__msg:Photo',
     Unknown: '__msg:Unknown'
 };

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

@@ -15,7 +15,7 @@ import {
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
 import { IActionWithState, ActionKey } from '../../types/actionWithState';
-import { MessageType } from '../../types/messageTypes';
+import { MessageTypeValue } from '../../types/messageTypes';
 
 /**
  * Context of action executed in chat, in response to a message
@@ -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: (typeof MessageType)[keyof typeof MessageType];
+    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

@@ -1,6 +1,6 @@
 import { Chat, Message, Update, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
-import { MessageType } from '../types/messageTypes';
+import { MessageType, MessageTypeValue } from '../types/messageTypes';
 
 export class IncomingMessage {
     message_id: number;
@@ -8,17 +8,18 @@ export class IncomingMessage {
     from: User | undefined;
     text: string;
     chatName: string;
-    type: (typeof MessageType)[keyof typeof MessageType];
+    type: MessageTypeValue;
     traceId = randomInt(10000, 99999);
 
     private detectMessageType(
         message: Update.New & (Update.NonChannel & Message)
     ) {
+        if ('photo' in message) return MessageType.Photo;
         if ('sticker' in message) return MessageType.Sticker;
         if ('animation' in message) return MessageType.Animation;
-        if ('document' in message) return MessageType.Document;
         if ('voice' in message) return MessageType.Voice;
         if ('audio' in message) return MessageType.Audio;
+        if ('document' in message) return MessageType.Document;
         if ('left_chat_member' in message) return MessageType.LeftChatMember;
         if ('new_chat_member' in message) return MessageType.NewChatMember;
         if ('poll' in message) return MessageType.Poll;

package/package.json

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

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/types/commandTrigger.ts

@@ -1,6 +1,3 @@
-import { MessageType } from './messageTypes';
+import { MessageTypeValue } from './messageTypes';
 
-export type CommandTrigger =
-    | (typeof MessageType)[keyof typeof MessageType]
-    | string
-    | RegExp;
+export type CommandTrigger = MessageTypeValue | string | RegExp;

package/types/messageTypes.ts

@@ -9,5 +9,8 @@ export const MessageType = {
     NewChatMember: '__msg:NewChatMember',
     Poll: '__msg:Poll',
     Location: '__msg:Location',
+    Photo: '__msg:Photo',
     Unknown: '__msg:Unknown'
 } as const;
+
+export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];