chz-telegram-bot 0.0.28 → 0.0.30

package/dist/entities/actions/commandAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,EAC9C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAkDvB"}
+{"version":3,"file":"commandAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/commandAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE1E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI3D,qBAAa,aAAa,CAAC,YAAY,SAAS,YAAY,CACxD,YAAW,gBAAgB;IAE3B,QAAQ,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC1C,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,GAAG,EAAE,SAAS,CAAC;gBAGX,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,EAC9C,OAAO,EAAE,cAAc,CAAC,YAAY,CAAC,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,EAAE,EACxB,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACzC,gBAAgB,EAAE,MAAM,YAAY;IAelC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC;IAgD5C,OAAO,CAAC,YAAY;CAmDvB"}

package/dist/entities/actions/commandAction.js

@@ -54,9 +54,9 @@ class CommandAction {
             return commandTriggerCheckResult_1.CommandTriggerCheckResult.DontTriggerAndSkipCooldown;
         const isUserAllowed = this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
+        const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
         const cooldownInMilliseconds = (0, timeConvertions_1.secondsToMilliseconds)(this.cooldownInSeconds);
-        const notOnCooldown = (0, moment_1.default)().valueOf() - state.lastExecutedDate >=
-            cooldownInMilliseconds;
+        const notOnCooldown = (0, moment_1.default)().diff(lastExecutedDate) >= cooldownInMilliseconds;
         if (isUserAllowed && notOnCooldown) {
             if (typeof trigger == 'string') {
                 shouldTrigger = ctx.messageText.toLowerCase() == trigger;

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

@@ -1 +1 @@
-{"version":3,"file":"scheduledAction.d.ts","sourceRoot":"","sources":["../../../entities/actions/scheduledAction.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,qBAAa,eAAe,CAAC,YAAY,SAAS,YAAY,CAC1D,YAAW,gBAAgB;IAE3B,MAAM,CAAC,SAAS,YAAoB;IAEpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;IAEf,WAAW,uBAA8B;IACzC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtD,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAGpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,WAAW,EAAE,UAAU,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAYlC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;YAmC3B,cAAc;IAqC5B,OAAO,CAAC,aAAa;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,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,qBAAa,eAAe,CAAC,YAAY,SAAS,YAAY,CAC1D,YAAW,gBAAgB;IAE3B,MAAM,CAAC,SAAS,YAAoB;IAEpC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;IAEf,WAAW,uBAA8B;IACzC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACtD,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAGpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,WAAW,EAAE,UAAU,EACvB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EAAE,EACnB,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAYlC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC;YAmC3B,cAAc;IAqC5B,OAAO,CAAC,aAAa;CAaxB"}

package/dist/entities/actions/scheduledAction.js

@@ -55,9 +55,14 @@ class ScheduledAction {
         }
     }
     shouldTrigger(state) {
-        const today = (0, moment_1.default)().startOf('day').valueOf();
-        const isAllowedToTrigger = (0, moment_1.default)().add(1, 'minute').hour().valueOf() >= this.timeinHours;
-        const hasTriggeredToday = state.lastExecutedDate >= today;
+        const startOfToday = (0, moment_1.default)().startOf('day').valueOf();
+        const lastExecutedDate = (0, moment_1.default)(state.lastExecutedDate);
+        const currentTime = (0, moment_1.default)();
+        const scheduledTime = (0, moment_1.default)()
+            .startOf('day')
+            .add(this.timeinHours, 'hours');
+        const isAllowedToTrigger = currentTime.isSameOrAfter(scheduledTime);
+        const hasTriggeredToday = lastExecutedDate.isAfter(startOfToday);
         return isAllowedToTrigger && !hasTriggeredToday;
     }
 }

package/dist/entities/botInstance.d.ts

@@ -1,3 +1,4 @@
+import { Seconds } from '../types/timeValues';
 import { IStorageClient } from '../types/storage';
 import { IActionState } from '../types/actionState';
 import { CommandAction } from './actions/commandAction';
@@ -18,6 +19,7 @@ export declare class BotInstance {
         chats: Record<string, number>;
         storageClient?: IStorageClient;
         storagePath?: string;
+        scheduledPeriod?: Seconds;
     });
     private initializeScheduledProcessing;
     private initializeMessageProcessing;

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

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAiCD,OAAO,CAAC,6BAA6B;IA6CrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAM5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC7B;IAmCD,OAAO,CAAC,6BAA6B;IA6CrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAyBZ,cAAc;CAmB/B"}

package/dist/entities/botInstance.js

@@ -26,18 +26,18 @@ class BotInstance {
                 new jsonFileStorage_1.JsonFileStorage(options.name, actions, options.storagePath);
         this.api = new telegramApi_1.TelegramApiService(this.name, this.telegraf.telegram, this.storage, this.chats);
         this.initializeMessageProcessing();
-        this.initializeScheduledProcessing();
+        this.initializeScheduledProcessing(options.scheduledPeriod ?? (0, timeConvertions_1.hoursToSeconds)(1));
         this.storage.saveMetadata(actions, this.name);
         this.telegraf.launch();
     }
-    initializeScheduledProcessing() {
+    initializeScheduledProcessing(period) {
         if (this.scheduled.length > 0) {
             const now = (0, moment_1.default)();
             let nextExecutionTime = now.clone().startOf('hour');
             if (now.minute() == 0 && now.second() == 0) {
                 taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
                     await this.runScheduled();
-                }, (0, timeConvertions_1.hoursToMilliseconds)(1), true, this.name);
+                }, (0, timeConvertions_1.secondsToMilliseconds)(period), true, this.name);
                 return;
             }
             if (now.minute() > 0 || now.second() > 0) {
@@ -47,7 +47,7 @@ class BotInstance {
             taskScheduler_1.Scheduler.createOnetimeTask('ScheduledProcessing_OneTime', async () => {
                 taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
                     await this.runScheduled();
-                }, (0, timeConvertions_1.hoursToMilliseconds)(1), true, this.name);
+                }, (0, timeConvertions_1.secondsToMilliseconds)(period), true, this.name);
             }, delay, this.name);
         }
     }

package/entities/actions/commandAction.ts

@@ -111,12 +111,13 @@ export class CommandAction<TActionState extends IActionState>
         const isUserAllowed =
             this.allowedUsers.length == 0 ||
             this.allowedUsers.includes(ctx.fromUserId);
+
+        const lastExecutedDate = moment(state.lastExecutedDate);
         const cooldownInMilliseconds = secondsToMilliseconds(
             this.cooldownInSeconds
         );
         const notOnCooldown =
-            moment().valueOf() - state.lastExecutedDate >=
-            cooldownInMilliseconds;
+            moment().diff(lastExecutedDate) >= cooldownInMilliseconds;
 
         if (isUserAllowed && notOnCooldown) {
             if (typeof trigger == 'string') {

package/entities/actions/scheduledAction.ts

@@ -119,11 +119,15 @@ export class ScheduledAction<TActionState extends IActionState>
     }
 
     private shouldTrigger(state: IActionState): boolean {
-        const today = moment().startOf('day').valueOf();
-
-        const isAllowedToTrigger =
-            moment().add(1, 'minute').hour().valueOf() >= this.timeinHours;
-        const hasTriggeredToday = state.lastExecutedDate >= today;
+        const startOfToday = moment().startOf('day').valueOf();
+        const lastExecutedDate = moment(state.lastExecutedDate);
+        const currentTime = moment();
+        const scheduledTime = moment()
+            .startOf('day')
+            .add(this.timeinHours, 'hours');
+
+        const isAllowedToTrigger = currentTime.isSameOrAfter(scheduledTime);
+        const hasTriggeredToday = lastExecutedDate.isAfter(startOfToday);
 
         return isAllowedToTrigger && !hasTriggeredToday;
     }

package/entities/botInstance.ts

@@ -1,6 +1,9 @@
 import { Telegraf } from 'telegraf';
-import { hoursToMilliseconds } from '../helpers/timeConvertions';
-import { Hours, Milliseconds } from '../types/timeValues';
+import {
+    hoursToSeconds,
+    secondsToMilliseconds
+} from '../helpers/timeConvertions';
+import { Hours, Milliseconds, Seconds } from '../types/timeValues';
 import { IStorageClient } from '../types/storage';
 import { JsonFileStorage } from '../services/jsonFileStorage';
 import { TelegramApiService } from '../services/telegramApi';
@@ -29,6 +32,7 @@ export class BotInstance {
         chats: Record<string, number>;
         storageClient?: IStorageClient;
         storagePath?: string;
+        scheduledPeriod?: Seconds;
     }) {
         this.name = options.name;
         this.commands = options.commands;
@@ -55,14 +59,16 @@ export class BotInstance {
         );
 
         this.initializeMessageProcessing();
-        this.initializeScheduledProcessing();
+        this.initializeScheduledProcessing(
+            options.scheduledPeriod ?? hoursToSeconds(1 as Hours)
+        );
 
         this.storage.saveMetadata(actions, this.name);
 
         this.telegraf.launch();
     }
 
-    private initializeScheduledProcessing() {
+    private initializeScheduledProcessing(period: Seconds) {
         if (this.scheduled.length > 0) {
             const now = moment();
 
@@ -74,7 +80,7 @@ export class BotInstance {
                     async () => {
                         await this.runScheduled();
                     },
-                    hoursToMilliseconds(1 as Hours),
+                    secondsToMilliseconds(period),
                     true,
                     this.name
                 );
@@ -96,7 +102,7 @@ export class BotInstance {
                         async () => {
                             await this.runScheduled();
                         },
-                        hoursToMilliseconds(1 as Hours),
+                        secondsToMilliseconds(period),
                         true,
                         this.name
                     );

package/package.json

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