chz-telegram-bot 0.0.19 → 0.0.20

package/dist/entities/actions/scheduledAction.d.ts

@@ -1,11 +1,11 @@
 import { Sema as Semaphore } from 'async-sema';
 import { ScheduledHandler } from '../../types/handlers';
 import { HoursOfDay } from '../../types/timeValues';
+import { IActionState } from '../../types/actionState';
 import { IActionWithState } from '../../types/actionWithState';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
-import { ActionStateBase } from '../states/actionStateBase';
-export declare class ScheduledAction implements IActionWithState {
+export declare class ScheduledAction<TActionState extends IActionState> implements IActionWithState {
     static semaphore: Semaphore;
     name: string;
     timeinHours: HoursOfDay;
@@ -13,10 +13,10 @@ export declare class ScheduledAction implements IActionWithState {
     chatsWhitelist: number[];
     key: string;
     cachedState: Map<string, unknown>;
-    stateConstructor: () => ActionStateBase;
+    stateConstructor: () => TActionState;
     cachedStateFactories: Map<string, CachedStateFactory>;
-    handler: ScheduledHandler;
-    constructor(name: string, handler: ScheduledHandler, timeinHours: HoursOfDay, active: boolean, whitelist: number[], cachedStateFactories: Map<string, CachedStateFactory>);
+    handler: ScheduledHandler<TActionState>;
+    constructor(name: string, handler: ScheduledHandler<TActionState>, timeinHours: HoursOfDay, active: boolean, whitelist: number[], cachedStateFactories: Map<string, CachedStateFactory>, stateConstructor: () => TActionState);
     exec(ctx: ChatContext): Promise<void>;
     private getCachedValue;
     private shouldTrigger;

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;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAK5D,qBAAa,eAAgB,YAAW,gBAAgB;IACpD,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,MAAM,CAAC;IAEZ,WAAW,uBAA8B;IACzC,gBAAgB,wBAA+B;IAC/C,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtD,OAAO,EAAE,gBAAgB,CAAC;gBAGtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,EACzB,WAAW,EAAE,UAAU,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC;IAWnD,IAAI,CAAC,GAAG,EAAE,WAAW;YA4Bb,cAAc;IAqC5B,OAAO,CAAC,aAAa;CASxB"}
+{"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,MAAM,6BAA6B,CAAC;AAC/D,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,MAAM,CAAC;IAEZ,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;YAkCb,cAAc;IAqC5B,OAAO,CAAC,aAAa;CASxB"}

package/dist/entities/actions/scheduledAction.js

@@ -7,14 +7,12 @@ exports.ScheduledAction = void 0;
 const moment_1 = __importDefault(require("moment"));
 const async_sema_1 = require("async-sema");
 const timeConvertions_1 = require("../../helpers/timeConvertions");
-const actionStateBase_1 = require("../states/actionStateBase");
 const actionExecutionResult_1 = require("../actionExecutionResult");
 const logger_1 = require("../../services/logger");
 const taskScheduler_1 = require("../../services/taskScheduler");
 class ScheduledAction {
-    constructor(name, handler, timeinHours, active, whitelist, cachedStateFactories) {
+    constructor(name, handler, timeinHours, active, whitelist, cachedStateFactories, stateConstructor) {
         this.cachedState = new Map();
-        this.stateConstructor = () => new actionStateBase_1.ActionStateBase();
         this.name = name;
         this.handler = handler;
         this.timeinHours = timeinHours;
@@ -22,6 +20,7 @@ class ScheduledAction {
         this.chatsWhitelist = whitelist;
         this.cachedStateFactories = cachedStateFactories;
         this.key = `scheduled:${this.name.replace('.', '-')}`;
+        this.stateConstructor = stateConstructor;
     }
     async exec(ctx) {
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatId))
@@ -30,7 +29,7 @@ class ScheduledAction {
         const isAllowedToTrigger = this.shouldTrigger(state);
         if (isAllowedToTrigger) {
             logger_1.Logger.logWithTraceId(ctx.botName, ctx.traceId, ctx.chatName, ` - Executing [${this.name}] in ${ctx.chatId}`);
-            await this.handler(ctx, (key) => this.getCachedValue(key, ctx.botName));
+            await this.handler(ctx, (key) => this.getCachedValue(key, ctx.botName), state);
             state.lastExecutedDate = (0, moment_1.default)().valueOf();
             await ctx.storage.saveActionExecutionResult(this, ctx.chatId, new actionExecutionResult_1.ActionExecutionResult(state, isAllowedToTrigger));
         }

package/dist/entities/botInstance.d.ts

@@ -15,7 +15,7 @@ export declare class BotInstance {
         name: string;
         token: string;
         commands: CommandAction<IActionState>[];
-        scheduled: ScheduledAction[];
+        scheduled: ScheduledAction<IActionState>[];
         chats: Map<string, number>;
         storageClient?: IStorageClient;
         storagePath?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAMA,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;AAK5D,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,CAAoB;IACrC,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,YAAY,CAAyB;IAC7C,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,EAAE,CAAC;QAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAuEK,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAqBZ,eAAe;CAmBhC"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAMA,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;AAK5D,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,CAAsB;IACnC,OAAO,CAAC,YAAY,CAAyB;IAC7C,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,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAuEK,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAqBZ,eAAe;CAmBhC"}

package/dist/helpers/builders/scheduledActionBuilder.d.ts

@@ -1,20 +1,26 @@
 import { ScheduledAction } from '../../entities/actions/scheduledAction';
 import { CachedStateFactory } from '../../entities/cachedStateFactory';
+import { ActionStateBase } from '../../entities/states/actionStateBase';
+import { IActionState } from '../../types/actionState';
 import { ScheduledHandler } from '../../types/handlers';
 import { Hours, HoursOfDay } from '../../types/timeValues';
-export declare class ScheduledActionBuilder {
+export declare class ScheduledActionBuilderWithState<TActionState extends IActionState> {
     active: boolean;
     time: HoursOfDay;
     cachedStateFactories: Map<string, CachedStateFactory>;
     whitelist: number[];
-    handler: ScheduledHandler;
+    stateConstructor: () => TActionState;
+    handler: ScheduledHandler<TActionState>;
     name: string;
-    constructor(name: string);
+    constructor(name: string, stateConstructor: () => TActionState);
     allowIn(chatId: number): this;
     runAt(time: HoursOfDay): this;
-    do(handler: ScheduledHandler): this;
+    do(handler: ScheduledHandler<TActionState>): this;
     withSharedCache(key: string, itemFactory: () => Promise<unknown>, invalidationTimeoutInHours?: Hours): this;
     disabled(): this;
-    build(): ScheduledAction;
+    build(): ScheduledAction<TActionState>;
+}
+export declare class ScheduledActionBuilder extends ScheduledActionBuilderWithState<ActionStateBase> {
+    constructor(name: string);
 }
 //# sourceMappingURL=scheduledActionBuilder.d.ts.map

package/dist/helpers/builders/scheduledActionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduledActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/scheduledActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG3D,qBAAa,sBAAsB;IAC/B,MAAM,UAAQ;IACd,IAAI,EAAE,UAAU,CAAK;IACrB,oBAAoB,kCAAyC;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,OAAO,EAAE,gBAAgB,CAAa;IAEtC,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM;IAIxB,OAAO,CAAC,MAAM,EAAE,MAAM;IAMtB,KAAK,CAAC,IAAI,EAAE,UAAU;IAMtB,EAAE,CAAC,OAAO,EAAE,gBAAgB;IAM5B,eAAe,CACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EACnC,0BAA0B,GAAE,KAAmB;IAUnD,QAAQ;IAMR,KAAK;CAUR"}
+{"version":3,"file":"scheduledActionBuilder.d.ts","sourceRoot":"","sources":["../../../helpers/builders/scheduledActionBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAG3D,qBAAa,+BAA+B,CACxC,YAAY,SAAS,YAAY;IAEjC,MAAM,UAAQ;IACd,IAAI,EAAE,UAAU,CAAK;IACrB,oBAAoB,kCAAyC;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAM;IACzB,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAa;IAEpD,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,YAAY;IAK9D,OAAO,CAAC,MAAM,EAAE,MAAM;IAMtB,KAAK,CAAC,IAAI,EAAE,UAAU;IAMtB,EAAE,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAM1C,eAAe,CACX,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EACnC,0BAA0B,GAAE,KAAmB;IAUnD,QAAQ;IAMR,KAAK;CAWR;AAED,qBAAa,sBAAuB,SAAQ,+BAA+B,CAAC,eAAe,CAAC;gBAC5E,IAAI,EAAE,MAAM;CAG3B"}

package/dist/helpers/builders/scheduledActionBuilder.js

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduledActionBuilder = void 0;
+exports.ScheduledActionBuilder = exports.ScheduledActionBuilderWithState = void 0;
 const scheduledAction_1 = require("../../entities/actions/scheduledAction");
 const cachedStateFactory_1 = require("../../entities/cachedStateFactory");
+const actionStateBase_1 = require("../../entities/states/actionStateBase");
 const noop_1 = require("../noop");
-class ScheduledActionBuilder {
-    constructor(name) {
+class ScheduledActionBuilderWithState {
+    constructor(name, stateConstructor) {
         this.active = true;
         this.time = 0;
         this.cachedStateFactories = new Map();
         this.whitelist = [];
         this.handler = noop_1.Noop.call;
         this.name = name;
+        this.stateConstructor = stateConstructor;
     }
     allowIn(chatId) {
         this.whitelist.push(chatId);
@@ -34,7 +36,13 @@ class ScheduledActionBuilder {
         return this;
     }
     build() {
-        return new scheduledAction_1.ScheduledAction(this.name, this.handler, this.time, this.active, this.whitelist, this.cachedStateFactories);
+        return new scheduledAction_1.ScheduledAction(this.name, this.handler, this.time, this.active, this.whitelist, this.cachedStateFactories, this.stateConstructor);
+    }
+}
+exports.ScheduledActionBuilderWithState = ScheduledActionBuilderWithState;
+class ScheduledActionBuilder extends ScheduledActionBuilderWithState {
+    constructor(name) {
+        super(name, () => new actionStateBase_1.ActionStateBase());
     }
 }
 exports.ScheduledActionBuilder = ScheduledActionBuilder;

package/dist/main.d.ts

@@ -7,7 +7,7 @@ declare function startBot(options: {
     name: string;
     tokenFilePath: string;
     commands: CommandAction<IActionState>[];
-    scheduled: ScheduledAction[];
+    scheduled: ScheduledAction<IActionState>[];
     chats: Map<string, number>;
     storageClient?: IStorageClient;
     storagePath?: string;

package/dist/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQrD,iBAAe,QAAQ,CAAC,OAAO,EAAE;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;IACxC,SAAS,EAAE,eAAe,EAAE,CAAC;IAC7B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,wBAcA;AAED,iBAAe,QAAQ,CAAC,MAAM,EAAE,MAAM,iBASrC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAQrD,iBAAe,QAAQ,CAAC,OAAO,EAAE;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;IACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;IAC3C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,wBAcA;AAED,iBAAe,QAAQ,CAAC,MAAM,EAAE,MAAM,iBASrC;AAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC"}

package/dist/types/handlers.d.ts

@@ -3,5 +3,5 @@ import { MessageContext } from '../entities/context/messageContext';
 import { IActionState } from './actionState';
 import { CachedValueAccessor } from './cachedValueAccessor';
 export type CommandHandler<TActionState extends IActionState> = (ctx: MessageContext<TActionState>, state: TActionState) => Promise<void>;
-export type ScheduledHandler = (ctx: ChatContext, getCached: CachedValueAccessor) => Promise<void>;
+export type ScheduledHandler<TActionState extends IActionState> = (ctx: ChatContext, getCached: CachedValueAccessor, state: TActionState) => Promise<void>;
 //# sourceMappingURL=handlers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI,CAC5D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG,CAC3B,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,mBAAmB,KAC7B,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI,CAC5D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,mBAAmB,EAC9B,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/entities/actions/scheduledAction.ts

@@ -7,12 +7,13 @@ import { IActionState } from '../../types/actionState';
 import { IActionWithState } from '../../types/actionWithState';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
-import { ActionStateBase } from '../states/actionStateBase';
 import { ActionExecutionResult } from '../actionExecutionResult';
 import { Logger } from '../../services/logger';
 import { Scheduler } from '../../services/taskScheduler';
 
-export class ScheduledAction implements IActionWithState {
+export class ScheduledAction<TActionState extends IActionState>
+    implements IActionWithState
+{
     static semaphore = new Semaphore(1);
 
     name: string;
@@ -22,17 +23,18 @@ export class ScheduledAction implements IActionWithState {
     key: string;
 
     cachedState = new Map<string, unknown>();
-    stateConstructor = () => new ActionStateBase();
+    stateConstructor: () => TActionState;
     cachedStateFactories: Map<string, CachedStateFactory>;
-    handler: ScheduledHandler;
+    handler: ScheduledHandler<TActionState>;
 
     constructor(
         name: string,
-        handler: ScheduledHandler,
+        handler: ScheduledHandler<TActionState>,
         timeinHours: HoursOfDay,
         active: boolean,
         whitelist: number[],
-        cachedStateFactories: Map<string, CachedStateFactory>
+        cachedStateFactories: Map<string, CachedStateFactory>,
+        stateConstructor: () => TActionState
     ) {
         this.name = name;
         this.handler = handler;
@@ -41,12 +43,16 @@ export class ScheduledAction implements IActionWithState {
         this.chatsWhitelist = whitelist;
         this.cachedStateFactories = cachedStateFactories;
         this.key = `scheduled:${this.name.replace('.', '-')}`;
+        this.stateConstructor = stateConstructor;
     }
 
     async exec(ctx: ChatContext) {
         if (!this.active || !this.chatsWhitelist.includes(ctx.chatId)) return;
 
-        const state = await ctx.storage.getActionState(this, ctx.chatId);
+        const state = await ctx.storage.getActionState<TActionState>(
+            this,
+            ctx.chatId
+        );
         const isAllowedToTrigger = this.shouldTrigger(state);
 
         if (isAllowedToTrigger) {
@@ -57,8 +63,11 @@ export class ScheduledAction implements IActionWithState {
                 ` - Executing [${this.name}] in ${ctx.chatId}`
             );
 
-            await this.handler(ctx, <TResult>(key: string) =>
-                this.getCachedValue<TResult>(key, ctx.botName)
+            await this.handler(
+                ctx,
+                <TResult>(key: string) =>
+                    this.getCachedValue<TResult>(key, ctx.botName),
+                state
             );
 
             state.lastExecutedDate = moment().valueOf();

package/entities/botInstance.ts

@@ -19,7 +19,7 @@ export class BotInstance {
     private api: TelegramApiService;
     private telegraf: Telegraf;
     private commands: CommandAction<IActionState>[];
-    private scheduled: ScheduledAction[];
+    private scheduled: ScheduledAction<IActionState>[];
     private chats: Map<string, number>;
     private messageQueue: IncomingMessage[] = [];
     storage: IStorageClient;
@@ -28,7 +28,7 @@ export class BotInstance {
         name: string;
         token: string;
         commands: CommandAction<IActionState>[];
-        scheduled: ScheduledAction[];
+        scheduled: ScheduledAction<IActionState>[];
         chats: Map<string, number>;
         storageClient?: IStorageClient;
         storagePath?: string;

package/helpers/builders/scheduledActionBuilder.ts

@@ -1,20 +1,26 @@
 import { ScheduledAction } from '../../entities/actions/scheduledAction';
 import { CachedStateFactory } from '../../entities/cachedStateFactory';
+import { ActionStateBase } from '../../entities/states/actionStateBase';
+import { IActionState } from '../../types/actionState';
 import { ScheduledHandler } from '../../types/handlers';
 import { Hours, HoursOfDay } from '../../types/timeValues';
 import { Noop } from '../noop';
 
-export class ScheduledActionBuilder {
+export class ScheduledActionBuilderWithState<
+    TActionState extends IActionState
+> {
     active = true;
     time: HoursOfDay = 0;
     cachedStateFactories = new Map<string, CachedStateFactory>();
     whitelist: number[] = [];
-    handler: ScheduledHandler = Noop.call;
+    stateConstructor: () => TActionState;
+    handler: ScheduledHandler<TActionState> = Noop.call;
 
     name: string;
 
-    constructor(name: string) {
+    constructor(name: string, stateConstructor: () => TActionState) {
         this.name = name;
+        this.stateConstructor = stateConstructor;
     }
 
     allowIn(chatId: number) {
@@ -29,7 +35,7 @@ export class ScheduledActionBuilder {
         return this;
     }
 
-    do(handler: ScheduledHandler) {
+    do(handler: ScheduledHandler<TActionState>) {
         this.handler = handler;
 
         return this;
@@ -55,13 +61,20 @@ export class ScheduledActionBuilder {
     }
 
     build() {
-        return new ScheduledAction(
+        return new ScheduledAction<TActionState>(
             this.name,
             this.handler,
             this.time,
             this.active,
             this.whitelist,
-            this.cachedStateFactories
+            this.cachedStateFactories,
+            this.stateConstructor
         );
     }
 }
+
+export class ScheduledActionBuilder extends ScheduledActionBuilderWithState<ActionStateBase> {
+    constructor(name: string) {
+        super(name, () => new ActionStateBase());
+    }
+}

package/main.ts

@@ -17,7 +17,7 @@ async function startBot(options: {
     name: string;
     tokenFilePath: string;
     commands: CommandAction<IActionState>[];
-    scheduled: ScheduledAction[];
+    scheduled: ScheduledAction<IActionState>[];
     chats: Map<string, number>;
     storageClient?: IStorageClient;
     storagePath?: string;

package/package.json

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

package/types/handlers.ts

@@ -8,7 +8,8 @@ export type CommandHandler<TActionState extends IActionState> = (
     state: TActionState
 ) => Promise<void>;
 
-export type ScheduledHandler = (
+export type ScheduledHandler<TActionState extends IActionState> = (
     ctx: ChatContext,
-    getCached: CachedValueAccessor
+    getCached: CachedValueAccessor,
+    state: TActionState
 ) => Promise<void>;