chz-telegram-bot 0.3.23 → 0.3.25

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

@@ -1,8 +1,9 @@
 import { ChatInfo } from '../../dtos/chatInfo';
 import { IAction, IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
+import { ICaptureController } from '../../types/capture';
 import { IScopedLogger } from '../../types/logger';
-import { BotResponse } from '../../types/response';
+import { BotResponse, IReplyResponse } from '../../types/response';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { TraceId } from '../../types/trace';
@@ -22,10 +23,12 @@ export declare abstract class BaseContextInternal<TAction extends IAction> {
     botName: string;
     /** Chat information. */
     chatInfo: ChatInfo;
+    get actionKey(): import("../../types/action").ActionKey;
     /** Ordered collection of responses to be processed  */
     get responses(): BotResponse[];
     set responses(value: BotResponse[]);
     constructor(storage: IStorageClient, scheduler: IScheduler);
+    protected createCaptureController(response: IReplyResponse): ICaptureController;
     /**
      * Loads state of another action for current chat.
      * @param action Action to load state of.

package/dist/entities/context/baseContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseContext.d.ts","sourceRoot":"","sources":["../../../entities/context/baseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,MAAM,2BAA2B,GACjC,QAAQ,GACR,eAAe,GACf,SAAS,GACT,WAAW,GACX,QAAQ,GACR,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEhB,8BAAsB,mBAAmB,CAAC,OAAO,SAAS,OAAO;IAC7D,aAAa,UAAS;IACtB,OAAO,CAAC,UAAU,CAAqB;IAEvC,MAAM,EAAG,OAAO,CAAC;IAEjB,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,MAAM,EAAG,aAAa,CAAC;IACvB,sCAAsC;IACtC,OAAO,EAAG,OAAO,CAAC;IAClB,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IAEpB,uDAAuD;IACvD,IAAW,SAAS,IAAI,WAAW,EAAE,CAEpC;IACD,IAAW,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAExC;gBAEW,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAK1D;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,MAAM,EAAE,gBAAgB,CAAC,mBAAmB,CAAC;CAWpD"}
+{"version":3,"file":"baseContext.d.ts","sourceRoot":"","sources":["../../../entities/context/baseContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,MAAM,MAAM,2BAA2B,GACjC,QAAQ,GACR,eAAe,GACf,SAAS,GACT,WAAW,GACX,QAAQ,GACR,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEhB,8BAAsB,mBAAmB,CAAC,OAAO,SAAS,OAAO;IAC7D,aAAa,UAAS;IACtB,OAAO,CAAC,UAAU,CAAqB;IAEvC,MAAM,EAAG,OAAO,CAAC;IAEjB,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,2DAA2D;IAC3D,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,MAAM,EAAG,aAAa,CAAC;IACvB,sCAAsC;IACtC,OAAO,EAAG,OAAO,CAAC;IAClB,+CAA+C;IAC/C,OAAO,EAAG,MAAM,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAG,QAAQ,CAAC;IACpB,IAAI,SAAS,2CAEZ;IAED,uDAAuD;IACvD,IAAW,SAAS,IAAI,WAAW,EAAE,CAEpC;IACD,IAAW,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,EAExC;gBAEW,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU;IAK1D,SAAS,CAAC,uBAAuB,CAC7B,QAAQ,EAAE,cAAc,GACzB,kBAAkB;IAmBrB;;;;OAIG;IACG,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,MAAM,EAAE,gBAAgB,CAAC,mBAAmB,CAAC;CAWpD"}

package/dist/entities/context/baseContext.js

@@ -16,6 +16,9 @@ class BaseContextInternal {
     botName;
     /** Chat information. */
     chatInfo;
+    get actionKey() {
+        return this.action.key;
+    }
     /** Ordered collection of responses to be processed  */
     get responses() {
         return this._responses;
@@ -27,6 +30,18 @@ class BaseContextInternal {
         this.storage = storage;
         this.scheduler = scheduler;
     }
+    createCaptureController(response) {
+        return {
+            captureReplies: (trigger, handler, abortController) => {
+                response.captures.push({
+                    trigger,
+                    handler,
+                    abortController: abortController ?? new AbortController(),
+                    action: this.action
+                });
+            }
+        };
+    }
     /**
      * Loads state of another action for current chat.
      * @param action Action to load state of.

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

@@ -1,9 +1,7 @@
 import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
-import { IReplyResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
-import { ICaptureController } from '../../types/capture';
 import { BaseContextInternal, BaseContextPropertiesToOmit } from './baseContext';
 import { ScheduledAction } from '../actions/scheduledAction';
 export type ChatContext<TActionState extends IActionState, TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>> = Omit<ChatContextInternal<TActionState, TAction>, BaseContextPropertiesToOmit>;
@@ -11,7 +9,6 @@ export type ChatContext<TActionState extends IActionState, TAction extends IActi
  * Context of action executed in chat.
  */
 export declare class ChatContextInternal<TActionState extends IActionState, TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>> extends BaseContextInternal<TAction> {
-    protected createCaptureController(response: IReplyResponse): ICaptureController;
     /**
      * Collection of actions that send something to chat as a standalone message.
      */
@@ -22,21 +19,21 @@ export declare class ChatContextInternal<TActionState extends IActionState, TAct
          * @param text Message contents.
          * @param options Message sending option.
          */
-        text: (text: string, options?: TextMessageSendingOptions) => ICaptureController;
+        text: (text: string, options?: TextMessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Sends image message to chat after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param name Message contents.
          * @param options Message sending option.
          */
-        image: (name: string, options?: MessageSendingOptions) => ICaptureController;
+        image: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Sends video/gif message to chat after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param name Message contents.
          * @param options Message sending option.
          */
-        video: (name: string, options?: MessageSendingOptions) => ICaptureController;
+        video: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
     };
     /**
      * Unpins message after action execution is finished.

package/dist/entities/context/chatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EACH,mBAAmB,EACnB,2BAA2B,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,MAAM,WAAW,CACnB,YAAY,SAAS,YAAY,EACjC,OAAO,SAAS,gBAAgB,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,IAC9E,IAAI,CACJ,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,EAC1C,2BAA2B,CAC9B,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB,CAC5B,YAAY,SAAS,YAAY,EACjC,OAAO,SAAS,gBAAgB,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,CAChF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAClC,SAAS,CAAC,uBAAuB,CAC7B,QAAQ,EAAE,cAAc,GACzB,kBAAkB;IAmBrB;;OAEG;IACH,IAAI;QACA;;;;;WAKG;qBACU,MAAM,YAAY,yBAAyB;QAexD;;;;;WAKG;sBACW,MAAM,YAAY,qBAAqB;QAerD;;;;;WAKG;sBACW,MAAM,YAAY,qBAAqB;MAcvD;IAEF;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;IAW9B;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,YAAY;CAK3B"}
+{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EACH,mBAAmB,EACnB,2BAA2B,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,MAAM,WAAW,CACnB,YAAY,SAAS,YAAY,EACjC,OAAO,SAAS,gBAAgB,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,IAC9E,IAAI,CACJ,mBAAmB,CAAC,YAAY,EAAE,OAAO,CAAC,EAC1C,2BAA2B,CAC9B,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAmB,CAC5B,YAAY,SAAS,YAAY,EACjC,OAAO,SAAS,gBAAgB,CAAC,YAAY,CAAC,GAAG,eAAe,CAAC,YAAY,CAAC,CAChF,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAClC;;OAEG;IACH,IAAI;QACA;;;;;WAKG;qBACU,MAAM,YAAY,yBAAyB;QAexD;;;;;WAKG;sBACW,MAAM,YAAY,qBAAqB;QAerD;;;;;WAKG;sBACW,MAAM,YAAY,qBAAqB;MAcvD;IAEF;;;;OAIG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM;IAW9B;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,YAAY;CAK3B"}

package/dist/entities/context/chatContext.js

@@ -12,18 +12,6 @@ const baseContext_1 = require("./baseContext");
  * Context of action executed in chat.
  */
 class ChatContextInternal extends baseContext_1.BaseContextInternal {
-    createCaptureController(response) {
-        return {
-            captureReplies: (trigger, handler, abortController) => {
-                response.captures.push({
-                    trigger,
-                    handler,
-                    abortController,
-                    action: this.action
-                });
-            }
-        };
-    }
     /**
      * Collection of actions that send something to chat as a standalone message.
      */

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

@@ -5,11 +5,8 @@ import { ReplyCaptureAction } from '../actions/replyCaptureAction';
 import { BaseContextInternal, BaseContextPropertiesToOmit } from './baseContext';
 import { UserInfo } from '../../dtos/userInfo';
 import { MessageInfo } from '../../dtos/messageInfo';
-import { ICaptureController } from '../../types/capture';
-import { IReplyResponse } from '../../types/response';
 export type ReplyContext<TActionState extends IActionState> = Omit<ReplyContextInternal<TActionState>, BaseContextPropertiesToOmit | 'messageId' | 'startCooldown' | 'customCooldown'>;
 export declare class ReplyContextInternal<TParentActionState extends IActionState> extends BaseContextInternal<ReplyCaptureAction<TParentActionState>> {
-    protected createCaptureController(response: IReplyResponse): ICaptureController;
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults: RegExpExecArray[];
     /** Id of a message that triggered this action. */
@@ -44,21 +41,21 @@ export declare class ReplyContextInternal<TParentActionState extends IActionStat
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => ICaptureController;
+            withText: (text: string, quote?: string, options?: TextMessageSendingOptions) => import("../..").ICaptureController;
             /**
              * Reply with image message to message that triggered this action after action execution is finished.
              * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withImage: (name: string, quote?: string, options?: MessageSendingOptions) => ICaptureController;
+            withImage: (name: string, quote?: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
             /**
              * Reply with video/gif message to message that triggered this action after action execution is finished.
              * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
              * @param text Message contents.
              * @param options Message sending option.
              */
-            withVideo: (name: string, quote?: string, options?: MessageSendingOptions) => ICaptureController;
+            withVideo: (name: string, quote?: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         };
         /**
          * Reply with text message to message that triggered this action after action execution is finished.
@@ -66,21 +63,21 @@ export declare class ReplyContextInternal<TParentActionState extends IActionStat
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withText: (text: string, options?: TextMessageSendingOptions) => ICaptureController;
+        withText: (text: string, options?: TextMessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Reply with image message to message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withImage: (name: string, options?: MessageSendingOptions) => ICaptureController;
+        withImage: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         /**
          * Reply with video/gif message to message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.
          * @param text Message contents.
          * @param options Message sending option.
          */
-        withVideo: (name: string, options?: MessageSendingOptions) => ICaptureController;
+        withVideo: (name: string, options?: MessageSendingOptions) => import("../..").ICaptureController;
         /**
          * React to the message that triggered this action after action execution is finished.
          * If multiple responses are sent, they will be sent in the order they were added, with delay of at least 35ms as per Telegram rate-limit.

package/dist/entities/context/replyContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replyContext.d.ts","sourceRoot":"","sources":["../../../entities/context/replyContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EACH,mBAAmB,EACnB,2BAA2B,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,YAAY,CAAC,YAAY,SAAS,YAAY,IAAI,IAAI,CAC9D,oBAAoB,CAAC,YAAY,CAAC,EAChC,2BAA2B,GAC3B,WAAW,GACX,eAAe,GACf,gBAAgB,CACrB,CAAC;AAEF,qBAAa,oBAAoB,CAC7B,kBAAkB,SAAS,YAAY,CACzC,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IACjE,SAAS,CAAC,uBAAuB,CAC7B,QAAQ,EAAE,cAAc,GACzB,kBAAkB;IAmBrB,4HAA4H;IAC5H,YAAY,EAAG,eAAe,EAAE,CAAC;IACjC,kDAAkD;IAClD,cAAc,EAAG,MAAM,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,QAAQ,EAAG,QAAQ,CAAC;IACpB,+DAA+D;IAC/D,WAAW,EAAG,WAAW,CAAC;IAC1B,6BAA6B;IAC7B,OAAO,EAAG,aAAa,CAAC;IAExB,aAAa,UAAS;IAEtB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,cAAc;IAqBtB;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BAEO,MAAM,UACJ,MAAM,YACJ,yBAAyB;YAIvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAKnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAMvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAG5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}
+{"version":3,"file":"replyContext.d.ts","sourceRoot":"","sources":["../../../entities/context/replyContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAM9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACH,yBAAyB,EACzB,qBAAqB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,EACH,mBAAmB,EACnB,2BAA2B,EAC9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,MAAM,YAAY,CAAC,YAAY,SAAS,YAAY,IAAI,IAAI,CAC9D,oBAAoB,CAAC,YAAY,CAAC,EAChC,2BAA2B,GAC3B,WAAW,GACX,eAAe,GACf,gBAAgB,CACrB,CAAC;AAEF,qBAAa,oBAAoB,CAC7B,kBAAkB,SAAS,YAAY,CACzC,SAAQ,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;IACjE,4HAA4H;IAC5H,YAAY,EAAG,eAAe,EAAE,CAAC;IACjC,kDAAkD;IAClD,cAAc,EAAG,MAAM,GAAG,SAAS,CAAC;IACpC,4DAA4D;IAC5D,QAAQ,EAAG,QAAQ,CAAC;IACpB,+DAA+D;IAC/D,WAAW,EAAG,WAAW,CAAC;IAC1B,6BAA6B;IAC7B,OAAO,EAAG,aAAa,CAAC;IAExB,aAAa,UAAS;IAEtB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAqBtB,OAAO,CAAC,cAAc;IAqBtB;;OAEG;IACH,WAAW;IAIX;;OAEG;IACH,KAAK;QACD;;;WAGG;;YAEC;;;;;eAKG;6BAEO,MAAM,UACJ,MAAM,YACJ,yBAAyB;YAIvC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;YAKnC;;;;;eAKG;8BAEO,MAAM,UACJ,MAAM,YACJ,qBAAqB;;QAMvC;;;;;WAKG;yBACc,MAAM,YAAY,yBAAyB;QAG5D;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;;WAKG;0BACe,MAAM,YAAY,qBAAqB;QAIzD;;;;WAIG;8BACmB,aAAa;MAWrC;CACL"}

package/dist/entities/context/replyContext.js

@@ -9,18 +9,6 @@ const videoMessage_1 = require("../../dtos/responses/videoMessage");
 const path_1 = require("path");
 const baseContext_1 = require("./baseContext");
 class ReplyContextInternal extends baseContext_1.BaseContextInternal {
-    createCaptureController(response) {
-        return {
-            captureReplies: (trigger, handler, abortController) => {
-                response.captures.push({
-                    trigger,
-                    handler,
-                    abortController,
-                    action: this.action
-                });
-            }
-        };
-    }
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults;
     /** Id of a message that triggered this action. */

package/dist/services/jsonLogger.d.ts

@@ -2,6 +2,7 @@ import { ILogger, IScopedLogger } from '../types/logger';
 import { TraceId } from '../types/trace';
 export declare class JsonLogger implements ILogger {
     private serializeError;
+    private getCircularReplacer;
     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;

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

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAQtB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG;IAQb,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAY1B"}
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,mBAAmB;IAmB3B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG;IAQb,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAe1B"}

package/dist/services/jsonLogger.js

@@ -9,6 +9,24 @@ class JsonLogger {
         });
         return JSON.stringify(plainObject);
     }
+    getCircularReplacer() {
+        const ancestors = [];
+        return function (_, value) {
+            if (typeof value !== 'object' || value === null) {
+                return value;
+            }
+            // `this` is the object that value is contained in,
+            // i.e., its direct parent.
+            while (ancestors.length > 0 && ancestors.at(-1) !== this) {
+                ancestors.pop();
+            }
+            if (ancestors.includes(value)) {
+                return '[Circular]';
+            }
+            ancestors.push(value);
+            return value;
+        };
+    }
     createScope(botName, traceId, chatName) {
         return {
             logObjectWithTraceId: (data) => {
@@ -33,7 +51,7 @@ class JsonLogger {
     }
     errorWithTraceId(botName, traceId, chatName, errorObj, extraData) {
         const dataString = extraData
-            ? `,"extraData":${JSON.stringify(extraData)}`
+            ? `,"extraData":${JSON.stringify(extraData, this.getCircularReplacer())}`
             : '';
         console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${dataString}}`);
     }

package/dist/types/capture.d.ts

@@ -13,7 +13,7 @@ export interface ICaptureController {
     /** Callback that will be called on trigger */
     handler: (replyContext: ReplyContext<TParentActionState>) => Promise<void>, 
     /** Abort controller to abort capturing manually */
-    abortController: AbortController) => void;
+    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,EACH,YAAY,EACZ,oBAAoB,EACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,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,CACL,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,KAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../types/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,oBAAoB,EACvB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,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,CAAC,EAAE,eAAe,KAChC,IAAI,CAAC;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,OAAO,EAAE,CACL,YAAY,EAAE,oBAAoB,CAAC,YAAY,CAAC,KAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;CACnB"}

package/entities/context/baseContext.ts

@@ -1,11 +1,14 @@
 import { ChatInfo } from '../../dtos/chatInfo';
 import { IAction, IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
+import { ICaptureController } from '../../types/capture';
+import { CommandTrigger } from '../../types/commandTrigger';
 import { IScopedLogger } from '../../types/logger';
-import { BotResponse } from '../../types/response';
+import { BotResponse, IReplyResponse } from '../../types/response';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { TraceId } from '../../types/trace';
+import { ReplyContext } from './replyContext';
 
 export type BaseContextPropertiesToOmit =
     | 'action'
@@ -34,6 +37,9 @@ export abstract class BaseContextInternal<TAction extends IAction> {
     botName!: string;
     /** Chat information. */
     chatInfo!: ChatInfo;
+    get actionKey() {
+        return this.action.key;
+    }
 
     /** Ordered collection of responses to be processed  */
     public get responses(): BotResponse[] {
@@ -48,6 +54,27 @@ export abstract class BaseContextInternal<TAction extends IAction> {
         this.scheduler = scheduler;
     }
 
+    protected createCaptureController(
+        response: IReplyResponse
+    ): ICaptureController {
+        return {
+            captureReplies: (
+                trigger: CommandTrigger[],
+                handler: (
+                    replyContext: ReplyContext<IActionState>
+                ) => Promise<void>,
+                abortController?: AbortController
+            ) => {
+                response.captures.push({
+                    trigger,
+                    handler,
+                    abortController: abortController ?? new AbortController(),
+                    action: this.action
+                });
+            }
+        };
+    }
+
     /**
      * Loads state of another action for current chat.
      * @param action Action to load state of.

package/entities/context/chatContext.ts

@@ -9,12 +9,8 @@ import {
 } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
-import { IReplyResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { DelayResponse } from '../../dtos/responses/delay';
-import { ICaptureController } from '../../types/capture';
-import { CommandTrigger } from '../../types/commandTrigger';
-import { ReplyContext } from './replyContext';
 import {
     BaseContextInternal,
     BaseContextPropertiesToOmit
@@ -36,27 +32,6 @@ export class ChatContextInternal<
     TActionState extends IActionState,
     TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>
 > extends BaseContextInternal<TAction> {
-    protected createCaptureController(
-        response: IReplyResponse
-    ): ICaptureController {
-        return {
-            captureReplies: (
-                trigger: CommandTrigger[],
-                handler: (
-                    replyContext: ReplyContext<TActionState>
-                ) => Promise<void>,
-                abortController: AbortController
-            ) => {
-                response.captures.push({
-                    trigger,
-                    handler,
-                    abortController,
-                    action: this.action
-                });
-            }
-        };
-    }
-
     /**
      * Collection of actions that send something to chat as a standalone message.
      */

package/entities/context/replyContext.ts

@@ -17,9 +17,6 @@ import {
 } from './baseContext';
 import { UserInfo } from '../../dtos/userInfo';
 import { MessageInfo } from '../../dtos/messageInfo';
-import { ICaptureController } from '../../types/capture';
-import { CommandTrigger } from '../../types/commandTrigger';
-import { IReplyResponse } from '../../types/response';
 
 export type ReplyContext<TActionState extends IActionState> = Omit<
     ReplyContextInternal<TActionState>,
@@ -32,27 +29,6 @@ export type ReplyContext<TActionState extends IActionState> = Omit<
 export class ReplyContextInternal<
     TParentActionState extends IActionState
 > extends BaseContextInternal<ReplyCaptureAction<TParentActionState>> {
-    protected createCaptureController(
-        response: IReplyResponse
-    ): ICaptureController {
-        return {
-            captureReplies: (
-                trigger: CommandTrigger[],
-                handler: (
-                    replyContext: ReplyContext<TParentActionState>
-                ) => Promise<void>,
-                abortController: AbortController
-            ) => {
-                response.captures.push({
-                    trigger,
-                    handler,
-                    abortController,
-                    action: this.action
-                });
-            }
-        };
-    }
-
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults!: RegExpExecArray[];
     /** Id of a message that triggered this action. */

package/package.json

@@ -14,7 +14,7 @@
         "type": "git",
         "url": "https://github.com/AlexSolari/botFramework.git"
     },
-    "version": "0.3.23",
+    "version": "0.3.25",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/jsonLogger.ts

@@ -12,6 +12,25 @@ export class JsonLogger implements ILogger {
         return JSON.stringify(plainObject);
     }
 
+    private getCircularReplacer() {
+        const ancestors: unknown[] = [];
+        return function <V>(this: V, _: unknown, value: V) {
+            if (typeof value !== 'object' || value === null) {
+                return value;
+            }
+            // `this` is the object that value is contained in,
+            // i.e., its direct parent.
+            while (ancestors.length > 0 && ancestors.at(-1) !== this) {
+                ancestors.pop();
+            }
+            if (ancestors.includes(value)) {
+                return '[Circular]';
+            }
+            ancestors.push(value);
+            return value;
+        };
+    }
+
     createScope(botName: string, traceId: TraceId, chatName: string) {
         return {
             logObjectWithTraceId: (data: any) => {
@@ -63,7 +82,10 @@ export class JsonLogger implements ILogger {
         extraData?: unknown
     ) {
         const dataString = extraData
-            ? `,"extraData":${JSON.stringify(extraData)}`
+            ? `,"extraData":${JSON.stringify(
+                  extraData,
+                  this.getCircularReplacer()
+              )}`
             : '';
 
         console.error(

package/types/capture.ts

@@ -19,7 +19,7 @@ export interface ICaptureController {
             replyContext: ReplyContext<TParentActionState>
         ) => Promise<void>,
         /** Abort controller to abort capturing manually */
-        abortController: AbortController
+        abortController?: AbortController
     ) => void;
 }