chz-telegram-bot 0.7.31 → 0.7.32

package/dist/entities/actions/commandAction.js

@@ -41,7 +41,7 @@ export class CommandAction {
         this.maxAllowedSimultaniousExecutions =
             maxAllowedSimultaniousExecutions;
         this.semaphoreFactory = () => new Semaphore(this.maxAllowedSimultaniousExecutions);
-        this.key = `command:${this.name.replace('.', '-')}`;
+        this.key = `command:${this.name.replaceAll('.', '-')}`;
     }
     async exec(ctx) {
         let lock;

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

@@ -1 +1 @@
-{"version":3,"file":"scheduledAction.d.ts","sourceRoot":"","sources":["../../../src/entities/actions/scheduledAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,eAAe,CACxB,YAAY,SAAS,YAAY,CACnC,YAAW,gBAAgB,CAAC,YAAY,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,KAAK,yBAAgC;IACrD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,SAAS,CAA0B;IAE3E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8C;IAClF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2C;IAC1E,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAErC;IAEF,QAAQ,CAAC,WAAW,uBAA8B;IAClD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/D,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAG7C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,SAAS,EAAE,wBAAwB,EACnC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAclC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,YAAY,CAAC;YAoDnC,cAAc;IA6D5B,OAAO,CAAC,uBAAuB;CAgBlC"}
+{"version":3,"file":"scheduledAction.d.ts","sourceRoot":"","sources":["../../../src/entities/actions/scheduledAction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,qBAAa,eAAe,CACxB,YAAY,SAAS,YAAY,CACnC,YAAW,gBAAgB,CAAC,YAAY,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,KAAK,yBAAgC;IACrD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,SAAS,CAA0B;IAE3E,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IAExB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8C;IAClF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA2C;IAC1E,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAErC;IAEF,QAAQ,CAAC,WAAW,uBAA8B;IAClD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IAC9C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC/D,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAG7C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACvC,SAAS,EAAE,wBAAwB,EACnC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,EACrD,gBAAgB,EAAE,MAAM,YAAY;IAclC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,YAAY,CAAC;YAoDnC,cAAc;IAgE5B,OAAO,CAAC,uBAAuB;CAqBlC"}

package/dist/entities/actions/scheduledAction.js

@@ -17,7 +17,7 @@ export class ScheduledAction {
     handler;
     constructor(name, handler, providers, cachedStateFactories, stateConstructor) {
         this.name = name;
-        this.key = `scheduled:${this.name.replace('.', '-')}`;
+        this.key = `scheduled:${this.name.replaceAll('.', '-')}`;
         this.timeinHoursProvider = providers.timeinHoursProvider;
         this.activeProvider = providers.isActiveProvider;
         this.chatsWhitelistProvider = providers.chatsWhitelistProvider;
@@ -67,7 +67,10 @@ export class ScheduledAction {
             });
             const value = await cachedItemFactory.getValue();
             this.cachedState.set(key, value);
-            ctx.scheduler.createOnetimeTask(`Drop cached value [${this.name} : ${key}]`, () => this.cachedState.delete(key), hoursToMilliseconds(cachedItemFactory.invalidationTimeoutInHours), ctx.botName);
+            ctx.scheduler.createOnetimeTask(`Drop cached value [${this.name} : ${key}]`, () => {
+                this.cachedState.delete(key);
+                ScheduledAction.locks.delete(semaphoreKey);
+            }, hoursToMilliseconds(cachedItemFactory.invalidationTimeoutInHours), ctx.botName);
             return value;
         }
         finally {
@@ -82,12 +85,14 @@ export class ScheduledAction {
     }
     checkIfShouldBeExecuted(state, ctx) {
         const now = new Date();
-        const startOfToday = new Date(now).setHours(0, 0, 0, 0);
+        const startOfToday = now.getTime() -
+            (now.getHours() * 3600000 +
+                now.getMinutes() * 60000 +
+                now.getSeconds() * 1000 +
+                now.getMilliseconds());
         const lastExecutedDate = new Date(state.lastExecutedDate);
-        const currentTime = now;
-        const scheduledTime = new Date(new Date().setHours(0, 0, 0, 0));
-        scheduledTime.setTime(scheduledTime.getTime() + this.timeinHoursProvider(ctx) * 3600000);
-        const isAllowedToTrigger = currentTime >= scheduledTime;
+        const scheduledTime = new Date(startOfToday + this.timeinHoursProvider(ctx) * 3600000);
+        const isAllowedToTrigger = now >= scheduledTime;
         const hasTriggeredToday = lastExecutedDate.getTime() > startOfToday;
         return isAllowedToTrigger && !hasTriggeredToday;
     }

package/dist/helpers/mapUtils.d.ts

@@ -6,6 +6,6 @@ type KeyedWriteableCollection<K, V> = KeyedReadonlyCollection<K, V> & {
 };
 export declare function getOrCreateIfNotExists<K, V>(map: KeyedWriteableCollection<K, V>, key: K, fallbackFactory: () => V): V;
 export declare function getOrSetIfNotExists<K, V>(map: KeyedWriteableCollection<K, V>, key: K, fallback: V): V;
-export declare function getOrThrow<K, V>(map: KeyedReadonlyCollection<K, V>, key: K, error?: string): NonNullable<V>;
+export declare function getOrThrow<K, V>(map: KeyedReadonlyCollection<K, V>, key: K, error?: string): V & ({} | null);
 export {};
 //# sourceMappingURL=mapUtils.d.ts.map

package/dist/helpers/mapUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapUtils.d.ts","sourceRoot":"","sources":["../../src/helpers/mapUtils.ts"],"names":[],"mappings":"AAAA,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC;AACxE,KAAK,wBAAwB,CAAC,CAAC,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IAClE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7D,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EACvC,GAAG,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,EACnC,GAAG,EAAE,CAAC,EACN,eAAe,EAAE,MAAM,CAAC,KAS3B;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACpC,GAAG,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,EACnC,GAAG,EAAE,CAAC,EACN,QAAQ,EAAE,CAAC,KAQd;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAC3B,GAAG,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,EAClC,GAAG,EAAE,CAAC,EACN,KAAK,GAAE,MAAsC,kBAMhD"}
+{"version":3,"file":"mapUtils.d.ts","sourceRoot":"","sources":["../../src/helpers/mapUtils.ts"],"names":[],"mappings":"AAAA,KAAK,uBAAuB,CAAC,CAAC,EAAE,CAAC,IAAI;IAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC;AACxE,KAAK,wBAAwB,CAAC,CAAC,EAAE,CAAC,IAAI,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;IAClE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7D,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EACvC,GAAG,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,EACnC,GAAG,EAAE,CAAC,EACN,eAAe,EAAE,MAAM,CAAC,KAS3B;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACpC,GAAG,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,EACnC,GAAG,EAAE,CAAC,EACN,QAAQ,EAAE,CAAC,KAQd;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAC3B,GAAG,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,EAClC,GAAG,EAAE,CAAC,EACN,KAAK,GAAE,MAAsC,mBAMhD"}

package/dist/helpers/mapUtils.js

@@ -1,6 +1,6 @@
 export function getOrCreateIfNotExists(map, key, fallbackFactory) {
     const existingValue = map.get(key);
-    if (existingValue)
+    if (existingValue !== undefined)
         return existingValue;
     const fallback = fallbackFactory();
     map.set(key, fallback);
@@ -8,14 +8,14 @@ export function getOrCreateIfNotExists(map, key, fallbackFactory) {
 }
 export function getOrSetIfNotExists(map, key, fallback) {
     const existingValue = map.get(key);
-    if (existingValue)
+    if (existingValue !== undefined)
         return existingValue;
     map.set(key, fallback);
     return fallback;
 }
 export function getOrThrow(map, key, error = 'Key not found in collection') {
     const existingValue = map.get(key);
-    if (existingValue)
+    if (existingValue !== undefined)
         return existingValue;
     throw new Error(error);
 }

package/dist/services/actionProcessors/commandActionProcessor.d.ts

@@ -7,7 +7,8 @@ import { BotInfo, TelegramBot } from '../../types/externalAliases';
 import { TraceId } from '../../types/trace';
 import { ReplyCapture } from '../../types/postSendOperations';
 export declare class CommandActionProcessor extends BaseActionProcessor {
-    private static readonly fallbackFactory;
+    private static readonly fallbackFactoryForChatHistory;
+    private static readonly fallbackFactoryForCaptures;
     private readonly replyCaptures;
     private readonly chatHistory;
     private botInfo;

package/dist/services/actionProcessors/commandActionProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commandActionProcessor.d.ts","sourceRoot":"","sources":["../../../src/services/actionProcessors/commandActionProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAC1B;IAEb,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;IACvE,OAAO,CAAC,OAAO,CAAW;IAE1B,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,OAAO,EAAE,OAAO;IAoDpB,2BAA2B,CACvB,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;IA2CpB,OAAO,CAAC,iBAAiB;YAuBX,cAAc;YA2Bd,YAAY;YA2BZ,sBAAsB;CAkCvC"}
+{"version":3,"file":"commandActionProcessor.d.ts","sourceRoot":"","sources":["../../../src/services/actionProcessors/commandActionProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAM/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,CACxC;IACb,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,0BAA0B,CACrC;IAEb,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG1B;IACJ,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA2C;IACvE,OAAO,CAAC,OAAO,CAAW;IAE1B,OAAO,CAAC,QAAQ,CAKd;IAEF,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,EACvC,OAAO,EAAE,OAAO;IAoDpB,2BAA2B,CACvB,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;IAmDpB,OAAO,CAAC,iBAAiB;YA0BX,cAAc;YAwBd,YAAY;YAwBZ,sBAAsB;CAuCvC"}

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -10,8 +10,9 @@ import { ChatHistoryMessage } from '../../dtos/chatHistoryMessage';
 import { BotEventType } from '../../types/events';
 import { MESSAGE_HISTORY_LENGTH_LIMIT } from '../../helpers/constants';
 export class CommandActionProcessor extends BaseActionProcessor {
-    static fallbackFactory = () => [];
-    replyCaptures = [];
+    static fallbackFactoryForChatHistory = () => [];
+    static fallbackFactoryForCaptures = () => [];
+    replyCaptures = new Map();
     chatHistory = new Map();
     botInfo;
     commands = typeSafeObjectFromEntries(Object.values(MessageType).map((x) => [
@@ -35,7 +36,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
         }
         if (commands.length > 0) {
             telegram.on('message', ({ message }) => {
-                const internalMessage = new IncomingMessage(message, this.botName, getOrCreateIfNotExists(this.chatHistory, message.chat.id, CommandActionProcessor.fallbackFactory));
+                const internalMessage = new IncomingMessage(message, this.botName, getOrCreateIfNotExists(this.chatHistory, message.chat.id, CommandActionProcessor.fallbackFactoryForChatHistory));
                 this.eventEmitter.emit(BotEventType.messageRecieved, {
                     botInfo: this.botInfo,
                     message: internalMessage,
@@ -52,12 +53,16 @@ export class CommandActionProcessor extends BaseActionProcessor {
             chatInfo,
             traceId
         });
-        this.replyCaptures.push(replyAction);
+        const chatCaptures = getOrCreateIfNotExists(this.replyCaptures, chatInfo.id, CommandActionProcessor.fallbackFactoryForCaptures);
+        chatCaptures.push(replyAction);
         capture.abortController.signal.addEventListener('abort', () => {
-            const capturesWithController = this.replyCaptures.filter((x) => x.abortController == capture.abortController);
+            const chatCaptures = this.replyCaptures.get(chatInfo.id);
+            if (!chatCaptures)
+                return;
+            const capturesWithController = chatCaptures.filter((x) => x.abortController == capture.abortController);
             for (const captureToCancel of capturesWithController) {
-                const index = this.replyCaptures.indexOf(captureToCancel);
-                this.replyCaptures.splice(index, 1);
+                const index = chatCaptures.indexOf(captureToCancel);
+                chatCaptures.splice(index, 1);
                 this.eventEmitter.emit(BotEventType.commandActionCaptureAborted, {
                     parentMessageId,
                     chatInfo,
@@ -67,36 +72,30 @@ export class CommandActionProcessor extends BaseActionProcessor {
         }, { once: true });
     }
     updateChatHistory(msg) {
-        const chatHistoryArray = getOrCreateIfNotExists(this.chatHistory, msg.chatInfo.id, CommandActionProcessor.fallbackFactory);
-        while (chatHistoryArray.length > MESSAGE_HISTORY_LENGTH_LIMIT)
-            chatHistoryArray.shift();
+        const chatHistoryArray = getOrCreateIfNotExists(this.chatHistory, msg.chatInfo.id, CommandActionProcessor.fallbackFactoryForChatHistory);
+        if (chatHistoryArray.length >= MESSAGE_HISTORY_LENGTH_LIMIT)
+            chatHistoryArray.splice(0, chatHistoryArray.length - MESSAGE_HISTORY_LENGTH_LIMIT + 1);
         chatHistoryArray.push(new ChatHistoryMessage(msg.messageId, msg.from, msg.text, msg.type, msg.traceId, msg.replyToMessageId, msg.updateObject.date));
     }
     async processCommand(command, msg) {
         const ctx = new MessageContextInternal(this.storage, this.scheduler, this.eventEmitter, command, msg, this.botName, this.botInfo);
         const { proxy, revoke } = Proxy.revocable(ctx, {});
-        let responses = undefined;
         try {
-            responses = await this.executeAction(command, proxy);
+            await this.executeAction(command, proxy);
         }
         finally {
-            if (responses && responses.length > 0) {
-                this.api.flushResponses();
-            }
+            this.api.flushResponses();
             revoke();
         }
     }
     async processReply(capture, msg) {
         const ctx = new ReplyContextInternal(this.storage, this.scheduler, this.eventEmitter, capture, msg, this.botName, this.botInfo);
         const { proxy, revoke } = Proxy.revocable(ctx, {});
-        let responses = undefined;
         try {
-            responses = await this.executeAction(capture, proxy);
+            await this.executeAction(capture, proxy);
         }
         finally {
-            if (responses && responses.length > 0) {
-                this.api.flushResponses();
-            }
+            this.api.flushResponses();
             revoke();
         }
     }
@@ -115,7 +114,8 @@ export class CommandActionProcessor extends BaseActionProcessor {
         for (const command of commandsToCheck) {
             actionPromises.push(this.processCommand(command, msg));
         }
-        for (const capture of this.replyCaptures) {
+        const chatCaptures = getOrCreateIfNotExists(this.replyCaptures, msg.chatInfo.id, CommandActionProcessor.fallbackFactoryForCaptures);
+        for (const capture of chatCaptures) {
             actionPromises.push(this.processReply(capture, msg));
         }
         try {

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

@@ -1 +1 @@
-{"version":3,"file":"nodeTimeoutScheduler.d.ts","sourceRoot":"","sources":["../../src/services/nodeTimeoutScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAgB,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,oBAAqB,YAAW,UAAU;IAI/C,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAJ5B,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE,CAAM;gBAG3B,YAAY,EAAE,iBAAiB,EAC/B,OAAO,EAAE,MAAM;IAG5B,OAAO;IAQP,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,EACrB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM;IA4BrB,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,EACrB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM;CAqBxB"}
+{"version":3,"file":"nodeTimeoutScheduler.d.ts","sourceRoot":"","sources":["../../src/services/nodeTimeoutScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAgB,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,qBAAa,oBAAqB,YAAW,UAAU;IAI/C,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IACxC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAJ5B,QAAQ,CAAC,WAAW,EAAE,UAAU,EAAE,CAAM;gBAG3B,YAAY,EAAE,iBAAiB,EAC/B,OAAO,EAAE,MAAM;IAG5B,OAAO;IAQP,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,EACrB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM;IA4BrB,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,OAAO,EACrB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM;CA2BxB"}

package/dist/services/nodeTimeoutScheduler.js

@@ -49,7 +49,12 @@ export class NodeTimeoutScheduler {
             });
             action();
         };
-        setTimeout(actionWrapper, delay);
+        const handle = setTimeout(() => {
+            this.activeTasks.splice(this.activeTasks.indexOf(task), 1);
+            actionWrapper();
+        }, delay);
+        const task = new TaskRecord(name, handle, delay, traceId);
+        this.activeTasks.push(task);
         this.eventEmitter.emit(BotEventType.taskCreated, {
             name,
             ownerName,

package/dist/types/events.d.ts

@@ -13,18 +13,18 @@ import { Milliseconds } from './timeValues';
 import { TraceId } from './trace';
 export declare const BotEventType: {
     readonly error: "error.generic";
-    readonly messageRecieved: "message.recieved";
+    readonly messageRecieved: "message.received";
     readonly messageProcessingStarted: "message.processingStarted";
     readonly messageProcessingFinished: "message.processingFinished";
     readonly commandActionExecuting: "command.actionExecuting";
     readonly commandActionExecuted: "command.actionExecuted";
-    readonly commandActionCaptureStarted: "command.captionStarted";
-    readonly commandActionCaptureAborted: "command.captionAborted";
+    readonly commandActionCaptureStarted: "command.captureStarted";
+    readonly commandActionCaptureAborted: "command.captureAborted";
     readonly replyActionExecuting: "reply.actionExecuting";
     readonly replyActionExecuted: "reply.actionExecuted";
     readonly inlineProcessingStarted: "inline.processingStarted";
     readonly inlineProcessingFinished: "inline.processingFinished";
-    readonly inlineQueryRecieved: "inline.queryRecieved";
+    readonly inlineQueryRecieved: "inline.queryReceived";
     readonly inlineActionExecuting: "inline.actionExecuting";
     readonly inlineActionExecuted: "inline.actionExecuted";
     readonly inlineProcessingAborting: "inline.processingAborting";

package/dist/types/events.js

@@ -1,17 +1,17 @@
 export const BotEventType = {
     error: 'error.generic',
-    messageRecieved: 'message.recieved',
+    messageRecieved: 'message.received',
     messageProcessingStarted: 'message.processingStarted',
     messageProcessingFinished: 'message.processingFinished',
     commandActionExecuting: 'command.actionExecuting',
     commandActionExecuted: 'command.actionExecuted',
-    commandActionCaptureStarted: 'command.captionStarted',
-    commandActionCaptureAborted: 'command.captionAborted',
+    commandActionCaptureStarted: 'command.captureStarted',
+    commandActionCaptureAborted: 'command.captureAborted',
     replyActionExecuting: 'reply.actionExecuting',
     replyActionExecuted: 'reply.actionExecuted',
     inlineProcessingStarted: 'inline.processingStarted',
     inlineProcessingFinished: 'inline.processingFinished',
-    inlineQueryRecieved: 'inline.queryRecieved',
+    inlineQueryRecieved: 'inline.queryReceived',
     inlineActionExecuting: 'inline.actionExecuting',
     inlineActionExecuted: 'inline.actionExecuted',
     inlineProcessingAborting: 'inline.processingAborting',

package/package.json

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