chz-telegram-bot 0.0.26 → 0.0.28

package/dist/services/telegramApi.d.ts

@@ -19,12 +19,12 @@ export declare class TelegramApiService {
     telegram: Telegram;
     chats: Record<number, string>;
     storage: IStorageClient;
+    interactions: IBotApiInteractions;
     constructor(botName: string, telegram: Telegram, storage: IStorageClient, chats: Record<string, number>);
     flushResponses(): Promise<void>;
     private pinIfShould;
     private processResponse;
     private enqueue;
-    private getInteractions;
     createContextForMessage<TActionState extends IActionState>(incomingMessage: IncomingMessage, command: CommandAction<TActionState>): MessageContext<TActionState>;
     createContextForChat<TActionState extends IActionState>(chatId: number, scheduledAction: ScheduledAction<TActionState>): ChatContext<TActionState>;
 }

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;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe;IAQvB,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,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"}

package/dist/services/telegramApi.js

@@ -3,7 +3,7 @@ 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 reverseRecord_1 = require("../helpers/reverseRecord");
+const inverseRecord_1 = require("../helpers/inverseRecord");
 const logger_1 = require("./logger");
 const promises_1 = require("timers/promises");
 const TELEGRAM_RATELIMIT_DELAY = 35;
@@ -13,8 +13,13 @@ class TelegramApiService {
         this.messageQueue = [];
         this.telegram = telegram;
         this.botName = botName;
-        this.chats = (0, reverseRecord_1.reverseRecord)(chats);
+        this.chats = (0, inverseRecord_1.inverseRecord)(chats);
         this.storage = storage;
+        this.interactions = {
+            react: (reaction) => this.enqueue(reaction),
+            respond: (response) => this.enqueue(response),
+            unpin: (unpinMessage) => this.enqueue(unpinMessage)
+        };
     }
     async flushResponses() {
         if (this.isFlushing)
@@ -37,7 +42,7 @@ class TelegramApiService {
     async pinIfShould(response, sentMessage) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(response.chatId, sentMessage.message_id, { disable_notification: true });
-            await this.storage.updateStateFor(response.sourceActionKey, response.chatId, async (state) => {
+            await this.storage.updateStateFor(response.action, response.chatId, async (state) => {
                 state.pinnedMessages.push(sentMessage.message_id);
             });
         }
@@ -78,7 +83,7 @@ class TelegramApiService {
                 return;
             case 'unpin':
                 await this.telegram.unpinChatMessage(response.chatId, response.messageId);
-                await this.storage.updateStateFor(response.sourceActionKey, response.chatId, async (state) => {
+                await this.storage.updateStateFor(response.action, response.chatId, async (state) => {
                     state.pinnedMessages = state.pinnedMessages.filter((x) => x != response.messageId);
                 });
                 break;
@@ -87,18 +92,11 @@ class TelegramApiService {
     enqueue(response) {
         this.messageQueue.push(response);
     }
-    getInteractions() {
-        return {
-            react: (reaction) => this.enqueue(reaction),
-            respond: (response) => this.enqueue(response),
-            unpin: (unpinMessage) => this.enqueue(unpinMessage)
-        };
-    }
     createContextForMessage(incomingMessage, command) {
-        return new messageContext_1.MessageContext(this.botName, command.key, this.getInteractions(), incomingMessage, this.storage);
+        return new messageContext_1.MessageContext(this.botName, command, this.interactions, incomingMessage, this.storage);
     }
     createContextForChat(chatId, scheduledAction) {
-        return new chatContext_1.ChatContext(this.botName, scheduledAction.key, this.getInteractions(), chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
+        return new chatContext_1.ChatContext(this.botName, scheduledAction, this.interactions, chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
     }
 }
 exports.TelegramApiService = TelegramApiService;

package/dist/types/actionWithState.d.ts

@@ -1,6 +1,9 @@
 import { IActionState } from './actionState';
+export type ActionKey = string & {
+    __brand: 'actionKey';
+};
 export interface IActionWithState {
-    key: string;
+    key: ActionKey;
     stateConstructor: () => IActionState;
 }
 //# sourceMappingURL=actionWithState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}
+{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,SAAS,CAAC;IACf,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}

package/dist/types/response.d.ts

@@ -3,6 +3,7 @@ import { Reaction } from '../entities/responses/reaction';
 import { TextMessage } from '../entities/responses/textMessage';
 import { UnpinResponse } from '../entities/responses/unpin';
 import { VideoMessage } from '../entities/responses/videoMessage';
+import { IActionWithState } from './actionWithState';
 export declare const BotResponseTypes: {
     readonly unpin: "unpin";
     readonly text: "text";
@@ -15,7 +16,7 @@ export interface IChatResponse {
     kind: keyof typeof BotResponseTypes;
     chatId: number;
     traceId: number | string;
-    sourceActionKey: string;
+    action: IActionWithState;
 }
 export interface IReplyMessage<TType> extends IChatResponse {
     content: TType;

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

@@ -1 +1 @@
-{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,eAAO,MAAM,gBAAgB;;;;;;CAMnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa,CAAC,KAAK,CAAE,SAAQ,aAAa;IACvD,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACtB"}
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,gBAAgB;;;;;;CAMnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IAEzB,MAAM,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,aAAa,CAAC,KAAK,CAAE,SAAQ,aAAa;IACvD,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACtB"}

package/dist/types/storage.d.ts

@@ -1,12 +1,12 @@
 import { ActionExecutionResult } from '../entities/actionExecutionResult';
 import { IActionState } from './actionState';
-import { IActionWithState } from './actionWithState';
+import { ActionKey, IActionWithState } from './actionWithState';
 export interface IStorageClient {
-    updateStateFor<TActionState extends IActionState>(sourceActionKey: string, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
+    updateStateFor<TActionState extends IActionState>(action: IActionWithState, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
     close(): Promise<void>;
-    load<TActionState extends IActionState>(key: string): Promise<Record<number, TActionState>>;
+    load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
     saveMetadata(actions: IActionWithState[], botName: string): Promise<void>;
-    getActionState<TActionState extends IActionState>(entity: IActionWithState, chatId: number): Promise<TActionState>;
+    getActionState<TActionState extends IActionState>(action: IActionWithState, chatId: number): Promise<TActionState>;
     saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: ActionExecutionResult): Promise<void>;
 }
 //# sourceMappingURL=storage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CACrB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CACrB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/entities/actions/commandAction.ts

@@ -5,7 +5,7 @@ import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
 import { toArray } from '../../helpers/toArray';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState } from '../../types/actionWithState';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CommandTriggerCheckResult } from '../commandTriggerCheckResult';
 import { MessageContext } from '../context/messageContext';
 import { Logger } from '../../services/logger';
@@ -23,7 +23,7 @@ export class CommandAction<TActionState extends IActionState>
     allowedUsers: number[];
     condition: CommandCondition<TActionState>;
     stateConstructor: () => TActionState;
-    key: string;
+    key: ActionKey;
 
     constructor(
         trigger: string | RegExp | string[] | RegExp[],
@@ -46,7 +46,7 @@ export class CommandAction<TActionState extends IActionState>
         this.condition = condition;
         this.stateConstructor = stateConstructor;
 
-        this.key = `command:${this.name.replace('.', '-')}`;
+        this.key = `command:${this.name.replace('.', '-')}` as ActionKey;
     }
 
     async exec(ctx: MessageContext<TActionState>) {

package/entities/actions/scheduledAction.ts

@@ -4,7 +4,7 @@ import { ScheduledHandler } from '../../types/handlers';
 import { hoursToMilliseconds } from '../../helpers/timeConvertions';
 import { HoursOfDay } from '../../types/timeValues';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState } from '../../types/actionWithState';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
 import { ActionExecutionResult } from '../actionExecutionResult';
@@ -20,7 +20,7 @@ export class ScheduledAction<TActionState extends IActionState>
     timeinHours: HoursOfDay;
     active: boolean;
     chatsWhitelist: number[];
-    key: string;
+    key: ActionKey;
 
     cachedState = new Map<string, unknown>();
     stateConstructor: () => TActionState;
@@ -42,7 +42,7 @@ export class ScheduledAction<TActionState extends IActionState>
         this.active = active;
         this.chatsWhitelist = whitelist;
         this.cachedStateFactories = cachedStateFactories;
-        this.key = `scheduled:${this.name.replace('.', '-')}`;
+        this.key = `scheduled:${this.name.replace('.', '-')}` as ActionKey;
         this.stateConstructor = stateConstructor;
     }
 
@@ -122,7 +122,7 @@ export class ScheduledAction<TActionState extends IActionState>
         const today = moment().startOf('day').valueOf();
 
         const isAllowedToTrigger =
-            moment().hour().valueOf() >= this.timeinHours;
+            moment().add(1, 'minute').hour().valueOf() >= this.timeinHours;
         const hasTriggeredToday = state.lastExecutedDate >= today;
 
         return isAllowedToTrigger && !hasTriggeredToday;

package/entities/botInstance.ts

@@ -35,6 +35,8 @@ export class BotInstance {
         this.scheduled = options.scheduled;
         this.chats = options.chats;
 
+        const actions = [...this.commands, ...this.scheduled];
+
         Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Start`,
@@ -44,7 +46,7 @@ export class BotInstance {
         this.telegraf = new Telegraf(options.token);
         this.storage =
             options.storageClient ??
-            new JsonFileStorage(options.name, options.storagePath);
+            new JsonFileStorage(options.name, actions, options.storagePath);
         this.api = new TelegramApiService(
             this.name,
             this.telegraf.telegram,
@@ -55,10 +57,7 @@ export class BotInstance {
         this.initializeMessageProcessing();
         this.initializeScheduledProcessing();
 
-        this.storage.saveMetadata(
-            [...this.commands, ...this.scheduled],
-            this.name
-        );
+        this.storage.saveMetadata(actions, this.name);
 
         this.telegraf.launch();
     }

package/entities/context/chatContext.ts

@@ -9,12 +9,13 @@ import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
+import { IActionWithState } from '../../types/actionWithState';
 
 /**
  * Context of action executed in chat.
  */
 export class ChatContext<TActionState> {
-    protected actionKey: string;
+    protected action: IActionWithState;
     protected interactions: IBotApiInteractions;
     updateActions: Array<(state: TActionState) => void> = [];
     /** Trace id of a action execution. */
@@ -30,7 +31,7 @@ export class ChatContext<TActionState> {
 
     constructor(
         botName: string,
-        actionKey: string,
+        action: IActionWithState,
         interactions: IBotApiInteractions,
         chatId: number,
         chatName: string,
@@ -38,7 +39,7 @@ export class ChatContext<TActionState> {
         storage: IStorageClient
     ) {
         this.botName = botName;
-        this.actionKey = actionKey;
+        this.action = action;
         this.interactions = interactions;
         this.chatId = chatId;
         this.chatName = chatName;
@@ -66,7 +67,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -85,7 +86,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -104,7 +105,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -116,12 +117,7 @@ export class ChatContext<TActionState> {
      */
     unpinMessage(messageId: number) {
         this.interactions.unpin(
-            new UnpinResponse(
-                messageId,
-                this.chatId,
-                this.traceId,
-                this.actionKey
-            )
+            new UnpinResponse(messageId, this.chatId, this.traceId, this.action)
         );
     }
 }

package/entities/context/messageContext.ts

@@ -14,6 +14,7 @@ import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 
 /**
  * Context of action executed in chat, in response to a message
@@ -36,14 +37,14 @@ export class MessageContext<
 
     constructor(
         botName: string,
-        scheduledKey: string,
+        action: IActionWithState,
         interactions: IBotApiInteractions,
         message: IncomingMessage,
         storage: IStorageClient
     ) {
         super(
             botName,
-            scheduledKey,
+            action,
             interactions,
             message.chat.id,
             message.chatName,
@@ -67,7 +68,10 @@ export class MessageContext<
     async loadStateOf<TAnotherActionState extends IActionState>(
         commandName: string
     ): Promise<TAnotherActionState> {
-        const storageKey = `command:${commandName.replace('.', '-')}`;
+        const storageKey = `command:${commandName.replace(
+            '.',
+            '-'
+        )}` as ActionKey;
         const allStates = await this.storage.load(storageKey);
         const stateForChat = allStates[this.chatId];
 
@@ -90,7 +94,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -109,7 +113,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -128,7 +132,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -145,7 +149,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 emoji,
-                this.actionKey
+                this.action
             )
         );
     }

package/entities/responses/imageMessage.ts

@@ -1,6 +1,7 @@
 import { InputFile } from 'telegraf/types';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
 import { MessageSendingOptions } from '../../types/messageSendingOptions';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class ImageMessage implements IReplyMessage<InputFile> {
     kind = BotResponseTypes.image;
@@ -11,14 +12,14 @@ export class ImageMessage implements IReplyMessage<InputFile> {
     traceId: string | number;
     disableWebPreview = false;
     shouldPin: boolean;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         image: InputFile,
         chatId: number,
         replyId: number | undefined,
         traceId: number | string,
-        sourceActionKey: string,
+        action: IActionWithState,
         options?: MessageSendingOptions
     ) {
         this.content = image;
@@ -26,6 +27,6 @@ export class ImageMessage implements IReplyMessage<InputFile> {
         this.replyId = replyId;
         this.traceId = traceId;
         this.shouldPin = options?.pin ?? false;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }

package/entities/responses/reaction.ts

@@ -1,5 +1,6 @@
 import { TelegramEmoji } from 'telegraf/types';
 import { BotResponseTypes, IChatResponse } from '../../types/response';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class Reaction implements IChatResponse {
     kind = BotResponseTypes.react;
@@ -8,19 +9,19 @@ export class Reaction implements IChatResponse {
     messageId: number;
     traceId: number | string;
     emoji: TelegramEmoji;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         traceId: number | string,
         chatId: number,
         messageId: number,
         emoji: TelegramEmoji,
-        sourceActionKey: string
+        action: IActionWithState
     ) {
         this.chatId = chatId;
         this.messageId = messageId;
         this.emoji = emoji;
         this.traceId = traceId;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }

package/entities/responses/textMessage.ts

@@ -1,5 +1,6 @@
 import { TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class TextMessage implements IReplyMessage<string> {
     kind = BotResponseTypes.text;
@@ -10,14 +11,14 @@ export class TextMessage implements IReplyMessage<string> {
     traceId: string | number;
     disableWebPreview: boolean;
     shouldPin: boolean;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         text: string,
         chatId: number,
         replyId: number | undefined,
         traceId: string | number,
-        sourceActionKey: string,
+        action: IActionWithState,
         options?: TextMessageSendingOptions
     ) {
         this.content = text;
@@ -26,6 +27,6 @@ export class TextMessage implements IReplyMessage<string> {
         this.traceId = traceId;
         this.disableWebPreview = options?.disableWebPreview ?? false;
         this.shouldPin = options?.pin ?? false;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }

package/entities/responses/unpin.ts

@@ -1,4 +1,5 @@
 import { BotResponseTypes, IChatResponse } from '../../types/response';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class UnpinResponse implements IChatResponse {
     kind = BotResponseTypes.unpin;
@@ -6,17 +7,17 @@ export class UnpinResponse implements IChatResponse {
     messageId: number;
     chatId: number;
     traceId: number | string;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         messageId: number,
         chatId: number,
         traceId: number | string,
-        sourceActionKey: string
+        action: IActionWithState
     ) {
         this.messageId = messageId;
         this.chatId = chatId;
         this.traceId = traceId;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }

package/entities/responses/videoMessage.ts

@@ -1,6 +1,7 @@
 import { InputFile } from 'telegraf/types';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
 import { MessageSendingOptions } from '../../types/messageSendingOptions';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class VideoMessage implements IReplyMessage<InputFile> {
     kind = BotResponseTypes.video;
@@ -11,14 +12,14 @@ export class VideoMessage implements IReplyMessage<InputFile> {
     traceId: string | number;
     disableWebPreview = false;
     shouldPin: boolean;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         video: InputFile,
         chatId: number,
         replyId: number | undefined,
         traceId: number | string,
-        sourceActionKey: string,
+        action: IActionWithState,
         options?: MessageSendingOptions
     ) {
         this.content = video;
@@ -26,6 +27,6 @@ export class VideoMessage implements IReplyMessage<InputFile> {
         this.replyId = replyId;
         this.traceId = traceId;
         this.shouldPin = options?.pin ?? false;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }

package/helpers/{reverseRecord.ts → inverseRecord.ts}

@@ -1,4 +1,4 @@
-export function reverseRecord<T extends PropertyKey, U extends PropertyKey>(
+export function inverseRecord<T extends PropertyKey, U extends PropertyKey>(
     input: Record<T, U>
 ) {
     return Object.fromEntries(

package/package.json

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