chz-telegram-bot 0.3.9 → 0.3.10

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -65,13 +65,13 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         }
         for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
-            this.executeAction(commandAction, ctx);
+            await this.executeAction(commandAction, ctx);
         }
         if (this.replyCaptures.length != 0) {
             const replyCtx = new replyContext_1.ReplyContext(this.storage, this.scheduler);
             for (const replyAction of this.replyCaptures) {
                 this.initializeReplyCaptureContext(replyCtx, replyAction, msg);
-                this.executeAction(replyAction, replyCtx);
+                await this.executeAction(replyAction, replyCtx);
             }
         }
         this.api.flushResponses();

package/dist/services/actionProcessors/inlineQueryActionProcessor.js

@@ -36,7 +36,7 @@ class InlineQueryActionProcessor extends baseProcessor_1.BaseActionProcessor {
                     queriesInProcessing.set(inlineQuery.userId, inlineQuery);
                     for (const inlineQueryAction of this.inlineQueries) {
                         this.initializeInlineQueryContext(ctx, inlineQuery.query, inlineQuery.queryId, inlineQueryAction, inlineQuery.abortController.signal, inlineQuery.traceId);
-                        this.executeAction(inlineQueryAction, ctx, (error, ctx) => {
+                        await this.executeAction(inlineQueryAction, ctx, (error, ctx) => {
                             if (error.name == 'AbortError') {
                                 ctx.logger.logWithTraceId(`Aborting query ${inlineQuery.queryId} (${inlineQuery.query}) successful.`);
                             }

package/dist/services/actionProcessors/scheduledActionProcessor.js

@@ -43,7 +43,7 @@ class ScheduledActionProcessor extends baseProcessor_1.BaseActionProcessor {
         for (const [chatName, chatId] of Object.entries(this.chats)) {
             for (const scheduledAction of this.scheduled) {
                 this.initializeChatContext(ctx, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName), (0, traceFactory_1.createTrace)(scheduledAction, this.botName, `${scheduledAction.key}-${chatId}`));
-                this.executeAction(scheduledAction, ctx);
+                await this.executeAction(scheduledAction, ctx);
             }
         }
         this.api.flushResponses();

package/dist/services/responseProcessingQueue.d.ts

@@ -3,6 +3,7 @@ export type QueueItem = {
     callback: () => Promise<void>;
 };
 export declare class ResponseProcessingQueue {
+    rateLimiter: () => Promise<void>;
     items: QueueItem[];
     isFlushing: boolean;
     enqueue(item: QueueItem): void;

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

@@ -1 +1 @@
-{"version":3,"file":"responseProcessingQueue.d.ts","sourceRoot":"","sources":["../../services/responseProcessingQueue.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC,CAAC;AAIF,qBAAa,uBAAuB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAM;IACxB,UAAU,UAAS;IAEnB,OAAO,CAAC,IAAI,EAAE,SAAS;IAmBjB,eAAe;CAiBxB"}
+{"version":3,"file":"responseProcessingQueue.d.ts","sourceRoot":"","sources":["../../services/responseProcessingQueue.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC,CAAC;AAIF,qBAAa,uBAAuB;IAChC,WAAW,sBAAwD;IACnE,KAAK,EAAE,SAAS,EAAE,CAAM;IACxB,UAAU,UAAS;IAEnB,OAAO,CAAC,IAAI,EAAE,SAAS;IAmBjB,eAAe;CAiBxB"}

package/dist/services/responseProcessingQueue.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseProcessingQueue = void 0;
-const promises_1 = require("timers/promises");
+const async_sema_1 = require("async-sema");
 const TELEGRAM_RATELIMIT_DELAY = 35;
 class ResponseProcessingQueue {
     constructor() {
+        this.rateLimiter = (0, async_sema_1.RateLimit)(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
         this.items = [];
         this.isFlushing = false;
     }
@@ -27,12 +28,10 @@ class ResponseProcessingQueue {
         this.isFlushing = true;
         while (this.items.length) {
             if (Date.now() >= this.items[0].priority) {
+                await this.rateLimiter();
                 const item = this.items.shift();
                 await item.callback();
             }
-            else {
-                await (0, promises_1.setTimeout)(TELEGRAM_RATELIMIT_DELAY);
-            }
         }
         this.isFlushing = false;
     }

package/package.json

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

package/services/actionProcessors/commandActionProcessor.ts

@@ -149,7 +149,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
         for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
-            this.executeAction(commandAction, ctx);
+            await this.executeAction(commandAction, ctx);
         }
 
         if (this.replyCaptures.length != 0) {
@@ -160,7 +160,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
             for (const replyAction of this.replyCaptures) {
                 this.initializeReplyCaptureContext(replyCtx, replyAction, msg);
-                this.executeAction(replyAction, replyCtx);
+                await this.executeAction(replyAction, replyCtx);
             }
         }
 

package/services/actionProcessors/inlineQueryActionProcessor.ts

@@ -101,7 +101,7 @@ export class InlineQueryActionProcessor extends BaseActionProcessor {
                                 inlineQuery.traceId
                             );
 
-                            this.executeAction(
+                            await this.executeAction(
                                 inlineQueryAction,
                                 ctx,
                                 (error, ctx) => {

package/services/actionProcessors/scheduledActionProcessor.ts

@@ -96,7 +96,7 @@ export class ScheduledActionProcessor extends BaseActionProcessor {
                     )
                 );
 
-                this.executeAction(scheduledAction, ctx);
+                await this.executeAction(scheduledAction, ctx);
             }
         }
 

package/services/responseProcessingQueue.ts

@@ -1,5 +1,5 @@
-import { setTimeout } from 'timers/promises';
 import { Milliseconds } from '../types/timeValues';
+import { RateLimit } from 'async-sema';
 
 export type QueueItem = {
     priority: number;
@@ -9,6 +9,7 @@ export type QueueItem = {
 const TELEGRAM_RATELIMIT_DELAY = 35 as Milliseconds;
 
 export class ResponseProcessingQueue {
+    rateLimiter = RateLimit(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
     items: QueueItem[] = [];
     isFlushing = false;
 
@@ -38,11 +39,11 @@ export class ResponseProcessingQueue {
 
         while (this.items.length) {
             if (Date.now() >= this.items[0].priority) {
+                await this.rateLimiter();
+
                 const item = this.items.shift()!;
 
                 await item.callback();
-            } else {
-                await setTimeout(TELEGRAM_RATELIMIT_DELAY);
             }
         }