chz-telegram-bot 0.3.1 → 0.3.3

package/dist/services/jsonLogger.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonLogger = void 0;
 class JsonLogger {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     serializeError(error) {
         const plainObject = {};
         Object.getOwnPropertyNames(error).forEach(function (key) {
@@ -10,9 +9,14 @@ class JsonLogger {
         });
         return JSON.stringify(plainObject);
     }
-    logObjectWithTraceId(botName, traceId, chatName, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    data) {
+    createScope(botName, traceId, chatName) {
+        return {
+            logObjectWithTraceId: (data) => this.logObjectWithTraceId(botName, traceId, chatName, data),
+            logWithTraceId: (text) => this.logWithTraceId(botName, traceId, chatName, text),
+            errorWithTraceId: (errorObj, extraData) => this.errorWithTraceId(botName, traceId, chatName, errorObj, extraData)
+        };
+    }
+    logObjectWithTraceId(botName, traceId, chatName, data) {
         data.botName = botName;
         data.traceId = traceId;
         data.chatName = chatName;

package/dist/services/telegramApi.d.ts

@@ -5,6 +5,7 @@ import { ILogger } from '../types/logger';
 import { IReplyCapture } from '../types/capture';
 import { TraceId } from '../types/trace';
 import { ChatInfo } from '../dtos/chatInfo';
+export declare const TELEGRAM_ERROR_QUOTE_INVALID = "QUOTE_TEXT_INVALID";
 export declare class TelegramApiService {
     private readonly queue;
     private readonly telegram;

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;AAE5C,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;IA8BhD,cAAc;YAIA,WAAW;YAkBX,eAAe;CAkGhC"}
+{"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"}

package/dist/services/telegramApi.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TelegramApiService = void 0;
+exports.TelegramApiService = exports.TELEGRAM_ERROR_QUOTE_INVALID = void 0;
 const responseProcessingQueue_1 = require("./responseProcessingQueue");
+exports.TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
 class TelegramApiService {
     constructor(botName, telegram, storage, logger, captureRegistrationCallback) {
         this.queue = new responseProcessingQueue_1.ResponseProcessingQueue();
@@ -20,13 +21,27 @@ class TelegramApiService {
             }
             const queueItem = {
                 callback: async () => {
+                    const scopedLogger = this.logger.createScope(this.botName, response.traceId, 'chatInfo' in response
+                        ? response.chatInfo.name
+                        : 'Unknown');
                     try {
                         await this.processResponse(response);
                     }
                     catch (error) {
-                        this.logger.errorWithTraceId(this.botName, response.traceId, 'chatInfo' in response
-                            ? response.chatInfo.name
-                            : 'Unknown', error, response);
+                        if ('message' in error) {
+                            const telegramResponse = error;
+                            if (telegramResponse.message.includes(exports.TELEGRAM_ERROR_QUOTE_INVALID)) {
+                                scopedLogger.logWithTraceId('Quote error recieved, retrying without quote');
+                                try {
+                                    await this.processResponse(response, true);
+                                }
+                                catch (error) {
+                                    scopedLogger.errorWithTraceId(error, response);
+                                }
+                                return;
+                            }
+                        }
+                        scopedLogger.errorWithTraceId(error, response);
                     }
                 },
                 priority: response.createdAt + offset
@@ -45,7 +60,7 @@ class TelegramApiService {
             });
         }
     }
-    async processResponse(response) {
+    async processResponse(response, ignoreQuote = false) {
         let sentMessage = null;
         switch (response.kind) {
             case 'text':
@@ -53,7 +68,9 @@ class TelegramApiService {
                     reply_parameters: response.replyInfo
                         ? {
                             message_id: response.replyInfo.id,
-                            quote: response.replyInfo.quote
+                            quote: ignoreQuote
+                                ? undefined
+                                : response.replyInfo.quote
                         }
                         : undefined,
                     parse_mode: 'MarkdownV2',

package/dist/types/capture.d.ts

@@ -3,7 +3,17 @@ import { IActionState } from './actionState';
 import { CommandTrigger } from './commandTrigger';
 import { IActionWithState } from './action';
 export interface ICaptureController {
-    captureReplies: <TParentActionState extends IActionState>(trigger: CommandTrigger[], handler: (replyContext: ReplyContext<TParentActionState>) => Promise<void>, abortController: AbortController) => void;
+    captureReplies: <TParentActionState extends IActionState>(
+    /**
+     * Defines action trigger.
+     * If `string` or `string[]` is provided, will be triggered only on exact message match.
+     * If `RegExp` or `RegExp[]` is provided, will be triggered on successful match.
+     */
+    trigger: CommandTrigger[], 
+    /** Callback that will be called on trigger */
+    handler: (replyContext: ReplyContext<TParentActionState>) => Promise<void>, 
+    /** Abort controller to abort capturing manually */
+    abortController: AbortController) => void;
 }
 export interface IReplyCapture {
     trigger: CommandTrigger[];

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

@@ -1 +1 @@
-{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,CAAC,kBAAkB,SAAS,YAAY,EACpD,OAAO,EAAE,cAAc,EAAE,EACzB,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC,EAClB,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,CAAC,kBAAkB,SAAS,YAAY;IACpD;;;;OAIG;IACH,OAAO,EAAE,cAAc,EAAE;IACzB,8CAA8C;IAC9C,OAAO,EAAE,CACL,YAAY,EAAE,YAAY,CAAC,kBAAkB,CAAC,KAC7C,OAAO,CAAC,IAAI,CAAC;IAClB,mDAAmD;IACnD,eAAe,EAAE,eAAe,KAC/B,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C"}

package/dist/types/commandCondition.d.ts

@@ -1,4 +1,8 @@
 import { MessageContext } from '../entities/context/messageContext';
 import { IActionState } from './actionState';
-export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>, state: TActionState) => boolean;
+export type CommandCondition<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) => boolean;
 //# sourceMappingURL=commandCondition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC"}
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI;AAC9D,oEAAoE;AACpE,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;AACjC,yCAAyC;AACzC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC"}

package/dist/types/logger.d.ts

@@ -1,5 +1,11 @@
 import { TraceId } from './trace';
+export interface IScopedLogger {
+    logObjectWithTraceId(data: any): void;
+    logWithTraceId(text: string): void;
+    errorWithTraceId<TData>(errorObj: unknown, extraData?: TData | undefined): 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;

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,OAAO;IACpB,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,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"}

package/dist/types/messageTypes.d.ts

@@ -1,6 +1,7 @@
 import { Message, Update } from 'telegraf/types';
 export declare const INTERNAL_MESSAGE_TYPE_PREFIX = "__msg:";
 export declare const MessageType: {
+    readonly Any: "__msg:ANY";
     readonly Text: "__msg:Text";
     readonly Sticker: "__msg:Sticker";
     readonly Animation: "__msg:Animation";

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

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjD,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAErD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcd,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC"}
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjD,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAErD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;CAed,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC"}

package/dist/types/messageTypes.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageType = exports.INTERNAL_MESSAGE_TYPE_PREFIX = void 0;
 exports.INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
 exports.MessageType = {
+    Any: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}ANY`,
     Text: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
     Sticker: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
     Animation: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,

package/entities/actions/commandAction.ts

@@ -10,6 +10,7 @@ import { CommandTriggerCheckResult } from '../../dtos/commandTriggerCheckResult'
 import { MessageContext } from '../context/messageContext';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { Noop } from '../../helpers/noop';
+import { MessageType } from '../../types/messageTypes';
 
 export class CommandAction<TActionState extends IActionState>
     implements IActionWithState<TActionState>
@@ -76,9 +77,6 @@ export class CommandAction<TActionState extends IActionState>
         if (!shouldExecute) return Noop.NoResponse;
 
         ctx.logger.logWithTraceId(
-            ctx.botName,
-            ctx.traceId,
-            ctx.chatInfo.name,
             ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
         );
         ctx.matchResults = matchResults;
@@ -137,7 +135,7 @@ export class CommandAction<TActionState extends IActionState>
         ctx: MessageContext<TActionState>,
         trigger: CommandTrigger
     ) {
-        if (trigger == ctx.messageType)
+        if (trigger == MessageType.Any || trigger == ctx.messageType)
             return CommandTriggerCheckResult.Trigger;
 
         if (typeof trigger == 'string')

package/entities/actions/inlineQueryAction.ts

@@ -53,12 +53,7 @@ export class InlineQueryAction implements IAction {
 
         ctx.matchResults = matchResults;
 
-        ctx.logger.logWithTraceId(
-            ctx.botName,
-            ctx.traceId,
-            'Unknown',
-            ` - Executing [${this.name}]`
-        );
+        ctx.logger.logWithTraceId(` - Executing [${this.name}]`);
 
         await this.handler(ctx);
 

package/entities/actions/replyCaptureAction.ts

@@ -51,9 +51,6 @@ export class ReplyCaptureAction<TParentActionState extends IActionState>
         if (!shouldExecute) return Noop.NoResponse;
 
         ctx.logger.logWithTraceId(
-            ctx.botName,
-            ctx.traceId,
-            ctx.chatInfo.name,
             ` - Executing [${this.key}] in ${ctx.chatInfo.id}`
         );
         ctx.matchResults = matchResults;

package/entities/actions/scheduledAction.ts

@@ -63,9 +63,6 @@ export class ScheduledAction<TActionState extends IActionState>
         if (!isAllowedToTrigger) return Noop.NoResponse;
 
         ctx.logger.logWithTraceId(
-            ctx.botName,
-            ctx.traceId,
-            ctx.chatInfo.name,
             ` - Executing [${this.name}] in ${ctx.chatInfo.id}`
         );
 

package/entities/context/chatContext.ts

@@ -14,7 +14,7 @@ import { BotResponse, IReplyResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { DelayResponse } from '../../dtos/responses/delay';
 import { ChatInfo } from '../../dtos/chatInfo';
-import { ILogger } from '../../types/logger';
+import { IScopedLogger } from '../../types/logger';
 import { IScheduler } from '../../types/scheduler';
 import { TraceId } from '../../types/trace';
 import { ICaptureController } from '../../types/capture';
@@ -30,10 +30,10 @@ export class ChatContext<TActionState extends IActionState> {
     /** Storage client instance for the bot executing this action. */
     readonly storage: IStorageClient;
     /** Logger instance for the bot executing this action */
-    readonly logger: ILogger;
     /** Scheduler instance for the bot executing this action */
     readonly scheduler: IScheduler;
 
+    logger!: IScopedLogger;
     /** Trace id of a action execution. */
     traceId!: TraceId;
     /** Name of a bot that executes this action. */
@@ -45,17 +45,12 @@ export class ChatContext<TActionState extends IActionState> {
 
     isInitialized = false;
 
-    constructor(
-        storage: IStorageClient,
-        logger: ILogger,
-        scheduler: IScheduler
-    ) {
+    constructor(storage: IStorageClient, scheduler: IScheduler) {
         this.storage = storage;
-        this.logger = logger;
         this.scheduler = scheduler;
     }
 
-    protected createCaptureController_TEMP(
+    protected createCaptureController(
         response: IReplyResponse
     ): ICaptureController {
         return {
@@ -76,6 +71,24 @@ export class ChatContext<TActionState extends IActionState> {
         };
     }
 
+    /**
+     * Loads state of another action for current chat.
+     * @param action Action to load state of.
+     * @template TAnotherActionState - Type of a state that is used by another action.
+     */
+    async loadStateOf<TAnotherActionState extends IActionState>(
+        action: IActionWithState<TAnotherActionState>
+    ) {
+        const allStates = await this.storage.load(action.key);
+        const stateForChat = allStates[this.chatInfo.id];
+
+        if (!stateForChat) {
+            return Object.freeze(action.stateConstructor());
+        }
+
+        return Object.freeze(stateForChat as TAnotherActionState);
+    }
+
     /**
      * Collection of actions that send something to chat as a standalone message.
      */
@@ -98,7 +111,7 @@ export class ChatContext<TActionState extends IActionState> {
 
             this.responses.push(response);
 
-            return this.createCaptureController_TEMP(response);
+            return this.createCaptureController(response);
         },
 
         /**
@@ -119,7 +132,7 @@ export class ChatContext<TActionState extends IActionState> {
 
             this.responses.push(response);
 
-            return this.createCaptureController_TEMP(response);
+            return this.createCaptureController(response);
         },
 
         /**
@@ -140,7 +153,7 @@ export class ChatContext<TActionState extends IActionState> {
 
             this.responses.push(response);
 
-            return this.createCaptureController_TEMP(response);
+            return this.createCaptureController(response);
         }
     };
 

package/entities/context/inlineQueryContext.ts

@@ -1,5 +1,5 @@
 import { InlineQueryResult } from 'telegraf/types';
-import { ILogger } from '../../types/logger';
+import { IScopedLogger } from '../../types/logger';
 import { BotResponse } from '../../types/response';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
@@ -13,11 +13,11 @@ export class InlineQueryContext {
 
     /** Storage client instance for the bot executing this action. */
     readonly storage: IStorageClient;
-    /** Logger instance for the bot executing this action */
-    readonly logger: ILogger;
     /** Scheduler instance for the bot executing this action */
     readonly scheduler: IScheduler;
 
+    /** Logger instance for the bot executing this action */
+    logger!: IScopedLogger;
     /** Trace id of a action execution. */
     traceId!: TraceId;
     /** Name of a bot that executes this action. */
@@ -48,13 +48,8 @@ export class InlineQueryContext {
 
     isInitialized = false;
 
-    constructor(
-        storage: IStorageClient,
-        logger: ILogger,
-        scheduler: IScheduler
-    ) {
+    constructor(storage: IStorageClient, scheduler: IScheduler) {
         this.storage = storage;
-        this.logger = logger;
         this.scheduler = scheduler;
     }
 

package/entities/context/messageContext.ts

@@ -6,18 +6,15 @@ import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { VideoMessage } from '../../dtos/responses/videoMessage';
-import { ActionStateBase } from '../states/actionStateBase';
 import { ChatContext } from './chatContext';
 import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
-import { ActionKey } from '../../types/action';
 import {
     MessageTypeValue,
     TelegrafContextMessage
 } from '../../types/messageTypes';
-import { ILogger } from '../../types/logger';
 import { IScheduler } from '../../types/scheduler';
 import { ReplyInfo } from '../../dtos/replyInfo';
 
@@ -44,12 +41,8 @@ export class MessageContext<
     /** Message object recieved from Telegram */
     messageUpdateObject!: TelegrafContextMessage;
 
-    constructor(
-        storage: IStorageClient,
-        logger: ILogger,
-        scheduler: IScheduler
-    ) {
-        super(storage, logger, scheduler);
+    constructor(storage: IStorageClient, scheduler: IScheduler) {
+        super(storage, scheduler);
     }
 
     private replyWithText(
@@ -73,7 +66,7 @@ export class MessageContext<
 
         this.responses.push(response);
 
-        return this.createCaptureController_TEMP(response);
+        return this.createCaptureController(response);
     }
 
     private replyWithImage(
@@ -97,7 +90,7 @@ export class MessageContext<
 
         this.responses.push(response);
 
-        return this.createCaptureController_TEMP(response);
+        return this.createCaptureController(response);
     }
 
     private replyWithVideo(
@@ -121,29 +114,7 @@ export class MessageContext<
 
         this.responses.push(response);
 
-        return this.createCaptureController_TEMP(response);
-    }
-
-    /**
-     * 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.
-     * @template TAnotherActionState - Type of a state that is used by another action.
-     */
-    async loadStateOf<TAnotherActionState extends IActionState>(
-        commandName: string
-    ): Promise<TAnotherActionState> {
-        const storageKey = `command:${commandName.replace(
-            '.',
-            '-'
-        )}` as ActionKey;
-        const allStates = await this.storage.load(storageKey);
-        const stateForChat = allStates[this.chatInfo.id];
-
-        if (!stateForChat) {
-            return new ActionStateBase() as TAnotherActionState;
-        }
-
-        return stateForChat as TAnotherActionState;
+        return this.createCaptureController(response);
     }
 
     /**

package/entities/context/replyContext.ts

@@ -6,7 +6,7 @@ import { Reaction } from '../../dtos/responses/reaction';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { VideoMessage } from '../../dtos/responses/videoMessage';
 import { IActionState } from '../../types/actionState';
-import { ILogger } from '../../types/logger';
+import { IScopedLogger } from '../../types/logger';
 import {
     TextMessageSendingOptions,
     MessageSendingOptions
@@ -27,8 +27,6 @@ export class ReplyContext<TParentActionState extends IActionState> {
 
     /** Storage client instance for the bot executing this action. */
     readonly storage: IStorageClient;
-    /** Logger instance for the bot executing this action */
-    readonly logger: ILogger;
     /** Scheduler instance for the bot executing this action */
     readonly scheduler: IScheduler;
 
@@ -36,6 +34,8 @@ export class ReplyContext<TParentActionState extends IActionState> {
     traceId!: TraceId;
     /** Name of a bot that executes this action. */
     botName!: string;
+    /** Logger instance for the bot executing this action */
+    logger!: IScopedLogger;
 
     /** Ordered collection of responses to be processed  */
     responses: BotResponse[] = [];
@@ -60,13 +60,8 @@ export class ReplyContext<TParentActionState extends IActionState> {
 
     isInitialized = false;
 
-    constructor(
-        storage: IStorageClient,
-        logger: ILogger,
-        scheduler: IScheduler
-    ) {
+    constructor(storage: IStorageClient, scheduler: IScheduler) {
         this.storage = storage;
-        this.logger = logger;
         this.scheduler = scheduler;
     }
 

package/package.json

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

package/services/actionProcessors/commandActionProcessor.ts

@@ -75,18 +75,16 @@ export class CommandActionProcessor {
                     this.botName
                 );
 
+                const logger = this.logger.createScope(
+                    this.botName,
+                    msg.traceId,
+                    msg.chatInfo.name
+                );
+
                 if (verboseLoggingForIncomingMessage) {
-                    this.logger.logObjectWithTraceId(
-                        this.botName,
-                        msg.traceId,
-                        msg.chatInfo.name,
-                        ctx.update.message
-                    );
+                    logger.logObjectWithTraceId(ctx.update.message);
                 } else {
-                    this.logger.logWithTraceId(
-                        this.botName,
-                        msg.traceId,
-                        msg.chatInfo.name,
+                    logger.logWithTraceId(
                         `${msg.from?.first_name ?? 'Unknown'} (${
                             msg.from?.id ?? 'Unknown'
                         }): ${msg.text || `<non-text message: ${msg.type}>`}`
@@ -118,10 +116,13 @@ export class CommandActionProcessor {
             capture.abortController
         );
 
-        this.logger.logWithTraceId(
+        const logger = this.logger.createScope(
             this.botName,
             traceId,
-            chatInfo.name,
+            chatInfo.name
+        );
+
+        logger.logWithTraceId(
             `Starting capturing replies to message ${parentMessageId} with action ${replyAction.key}`
         );
 
@@ -131,10 +132,7 @@ export class CommandActionProcessor {
             const index = this.replyCaptures.indexOf(replyAction);
             this.replyCaptures.splice(index, 1);
 
-            this.logger.logWithTraceId(
-                this.botName,
-                traceId,
-                chatInfo.name,
+            logger.logWithTraceId(
                 `Stopping capturing replies to message ${parentMessageId} with action ${replyAction.key}`
             );
         });
@@ -143,7 +141,6 @@ export class CommandActionProcessor {
     private async processMessage(msg: IncomingMessage) {
         const ctx = new MessageContext<IActionState>(
             this.storage,
-            this.logger,
             this.scheduler
         );
 
@@ -155,19 +152,12 @@ export class CommandActionProcessor {
                 this.api.enqueueBatchedResponses(responses);
                 ctx.isInitialized = false;
             } catch (error) {
-                this.logger.errorWithTraceId(
-                    ctx.botName,
-                    ctx.traceId,
-                    ctx.chatInfo.name,
-                    error,
-                    ctx
-                );
+                ctx.logger.errorWithTraceId(error, ctx);
             }
         }
 
         const replyCtx = new ReplyContext<IActionState>(
             this.storage,
-            this.logger,
             this.scheduler
         );
 
@@ -179,13 +169,7 @@ export class CommandActionProcessor {
                 this.api.enqueueBatchedResponses(responses);
                 replyCtx.isInitialized = false;
             } catch (error) {
-                this.logger.errorWithTraceId(
-                    replyCtx.botName,
-                    replyCtx.traceId,
-                    replyCtx.chatInfo.name,
-                    error,
-                    replyCtx
-                );
+                replyCtx.logger.errorWithTraceId(error, replyCtx);
             }
         }
 
@@ -213,6 +197,12 @@ export class CommandActionProcessor {
 
         ctx.isInitialized = true;
         ctx.matchResults = [];
+
+        ctx.logger = this.logger.createScope(
+            this.botName,
+            message.traceId,
+            message.chatInfo.name
+        );
     }
 
     private initializeMessageContext<TActionState extends IActionState>(
@@ -238,5 +228,11 @@ export class CommandActionProcessor {
         ctx.action = action;
         ctx.chatInfo = message.chatInfo;
         ctx.traceId = message.traceId;
+
+        ctx.logger = this.logger.createScope(
+            this.botName,
+            message.traceId,
+            message.chatInfo.name
+        );
     }
 }