feat: Update dependencies and add rate limiting to bot`

diff` contains changes to `package-lock.json, package.json`, `src/bot/index.ts, src/decorators/Context.ts, and src/utils/RateLimiter.ts

Author: m-mdy-m

package-lock.json

@@ -48,6 +48,7 @@
   },
   "homepage": "https://github.com/CodeModule-ir/cop#readme",
   "dependencies": {
+    "@grammyjs/ratelimiter": "^1.2.1",
     "@medishn/logger": "^2.0.0",
     "express": "^4.21.1",
     "grammy": "^1.27.0",

package.json

@@ -1,4 +1,4 @@
-import { Bot, webhookCallback } from 'grammy';
+import { Bot, webhookCallback, BotError } from 'grammy';
 import type { Context } from 'grammy';
 import Config from '../config';
 import { GenerateCommand } from './handlers/GenerateCommands';
@@ -7,6 +7,7 @@ import { MessageValidator } from '../decorators/Context';
 import * as express from 'express';
 import { BotReply } from '../utils/chat/BotReply';
 import logger from '../utils/logger';
+import { limit } from '@grammyjs/ratelimiter';
 export class CopBot {
   private static instance: CopBot;
   private _bot: Bot<Context>;
@@ -29,6 +30,8 @@ export class CopBot {
   async start(): Promise<void> {
     const startBot = async (mode: string) => {
       await this._bot.start({
+        drop_pending_updates: true,
+        timeout: 60,
         onStart: (botInfo) => {
           logger.info(`Bot started in ${mode} mode! Username: ${botInfo.username}`);
         },
@@ -93,7 +96,6 @@ export class CopBot {
           };
 
           await trySetWebhook();
-          await startBot(mode);
         });
       } catch (err: any) {
         console.error('Error setting up webhook:', err);
@@ -112,13 +114,19 @@ export class CopBot {
     new GenerateCommand(this._bot).generate();
     this._bot.on('my_chat_member', (ctx) => this.handleJoinNewChat(ctx));
     this._bot.on('message', (ctx) => this.handleMessage(ctx));
-    this._bot.catch((err) => {
-      console.error('Middleware error:', err);
+    this._bot.catch((error: BotError<Context>) => {
+      logger.error(`Bot error occurred: ${error.error}`);
     });
+    this._bot.use(
+      limit({
+        onLimitExceeded: (ctx) => ctx.reply('Too many requests! Please slow down.'),
+      })
+    );
     await this.start();
     logger.info('Bot is running');
   }
   @MessageValidator()
+  @SaveUserData()
   async handleMessage(ctx: Context) {}
   @SaveUserData()
   async handleJoinNewChat(ctx: Context) {

src/bot/index.ts

@@ -1,7 +1,6 @@
 import { BotReply } from '../utils/chat/BotReply';
 import { MessagesService } from '../service/messages';
 import { RateLimitConfig } from '../types/CommandTypes';
-import { RateLimiter } from '../utils/RateLimiter';
 import { createDecorator } from './index';
 /**
  * A decorator to restrict commands to group chats.
@@ -73,20 +72,3 @@ export function RequireReply() {
     }
   });
 }
-export function RateLimit(config: RateLimitConfig = {}) {
-  const limiter = new RateLimiter(config.commandLimit || 5, config.timeFrame || 10000); // Initialize the limiter
-
-  return createDecorator(async (ctx, next, close) => {
-    const userId = ctx.from?.id;
-    if (!userId) {
-      close();
-      return;
-    }
-    if (limiter.checkRateLimit(userId)) {
-      return await next();
-    } else {
-      await ctx.reply('⏳ You are being rate-limited. Please try again later.');
-      close();
-    }
-  });
-}