feat: introducing react queue, so the bot react one message at the time, this is seperated from download queue

Author: mrepol742

src/components/client.ts

@@ -20,7 +20,7 @@ import revoke from "./events/revoke";
 import callEvent from "./events/call";
 import DownloadMedia from "./utils/message/download";
 import CheckSpamLink from "./utils/phishtank/checkSpam";
-import queue from "./queue";
+import queue from "./queue/download";
 import groupAdminChanged from "./events/groups/groupAdminChanged";
 
 let instance: Client | null = null;
@@ -91,7 +91,6 @@ function registerEvents(client: Client): void {
 
   client.on("message_create", (msg: Message) => {
     CheckSpamLink(msg);
-    queue.add(() => DownloadMedia(msg));
     messageEvent(msg, "create");
   });
   client.on("media_uploaded", (msg: Message) =>

src/components/events/message.ts

@@ -1,13 +1,7 @@
-import {
-  Client,
-  Message,
-  MessageContent,
-  MessageSendOptions,
-} from "whatsapp-web.js";
+import { Message, MessageContent, MessageSendOptions } from "whatsapp-web.js";
 import log from "../utils/log";
 import { commands } from "../utils/cmd/loader";
 import { penalizeUser, rateLimiter } from "../utils/rateLimiter";
-import sleep from "../utils/sleep";
 import {
   addBlockUser,
   deductUserPoints,
@@ -21,14 +15,12 @@ import quiz from "../utils/quiz";
 import riddle from "../utils/riddle";
 import { getSetting } from "../services/settings";
 import { errors, mentionResponses } from "../utils/data";
-import { funD, happyEE, sadEE, loveEE } from "../../data/reaction";
-import { containsAny } from "../utils/string";
+import autoReaction from "../utils/message/react";
 import { InstantDownloader } from "../utils/instantdl/downloader";
 import { checkInappropriate } from "../utils/contentChecker";
-import prisma from "../prisma";
 import redis from "../redis";
-import queue from "../queue";
-import regex from "../emoji";
+import downloadQueue from "../queue/download";
+import reactQueue from "../queue/react";
 import ai from "../../commands/ai";
 import * as Sentry from "@sentry/node";
 
@@ -127,7 +119,7 @@ export default async function (msg: Message, type: string): Promise<void> {
       await Promise.allSettled([
         quiz(msg),
         riddle(msg),
-        queue.add(() => InstantDownloader(msg)),
+        downloadQueue.add(() => InstantDownloader(msg)),
         (async () => {
           // override the msg!
           const react = { ...msg };
@@ -142,40 +134,7 @@ export default async function (msg: Message, type: string): Promise<void> {
           )
             return;
 
-          react.react = async (reaction: string): Promise<void> => {
-            // add delay for more
-            // humanly like interaction
-            const min = 2000;
-            const max = 6000;
-            const randomMs = Math.floor(Math.random() * (max - min + 1)) + min;
-
-            await sleep(randomMs);
-            const isEmoji = /.*[A-Za-z0-9].*/.test(reaction);
-            log.info("AutoReact", lid, reaction);
-
-            if (Math.random() < 0.1 && !isEmoji)
-              if (Math.random() < 0.2)
-                (await client()).sendMessage(react.id.remote, reaction);
-              else await msg.reply(reaction);
-            else await msg.react(reaction);
-          };
-
-          const emojis = [
-            ...new Set([...react.body.matchAll(regex)].map((m) => m[0])),
-          ];
-          if (emojis.length > 0) {
-            await react.react(
-              emojis[Math.floor(Math.random() * emojis.length)],
-            );
-          } else if (containsAny(react.body, funD)) {
-            await react.react("🤣");
-          } else if (containsAny(react.body, happyEE)) {
-            await msg.reply(funD[Math.floor(Math.random() * funD.length)]);
-          } else if (containsAny(react.body, sadEE)) {
-            await react.react("😭");
-          } else if (containsAny(react.body, loveEE)) {
-            await react.react("❤️");
-          }
+          reactQueue.add(() => autoReaction(msg));
         })(),
         (async () => {
           const botId = (await client()).info.wid._serialized;

src/components/events/reaction.ts

@@ -6,6 +6,7 @@ import { rateLimiter } from "../utils/rateLimiter";
 import { getBlockUser } from "../services/user";
 import * as Sentry from "@sentry/node";
 import redis from "../redis";
+import reactQueue from "../queue/react";
 
 export default async function (client: Client, react: Reaction): Promise<void> {
   if (react.msgId.fromMe || react.id.fromMe) return;
@@ -39,9 +40,15 @@ export default async function (client: Client, react: Reaction): Promise<void> {
   try {
     const message = await client.getMessageById(react.msgId._serialized);
     if (!message) return;
-    await sleep(2000);
+
+    const min = 2000;
+    const max = 6000;
+    const randomMs = Math.floor(Math.random() * (max - min + 1)) + min;
+
+    await sleep(randomMs);
+
     await Promise.allSettled([
-      message.react(react.reaction),
+      reactQueue.add(() => message.react(react.reaction)),
       redis.set(key, "1", {
         expiration: {
           type: "EX",

src/components/process.ts

@@ -2,7 +2,8 @@ import * as Sentry from "@sentry/node";
 import log from "./utils/log";
 import { client } from "./client";
 import redis from "./redis";
-import queue from "./queue";
+import downloadQueue from "./queue/download";
+import reactQueue from "./queue/react";
 import prisma from "./prisma";
 
 async function gracefulShutdown(signal: string): Promise<void> {
@@ -14,12 +15,11 @@ async function gracefulShutdown(signal: string): Promise<void> {
       await popupBrowser.close();
       log.info("Browser", "Puppeteer browser closed successfully.");
     }
+    // all work must be empty, before it send a SAVE Command to redis
+    // avoiding conflicts when exiting the redis and db
+    await Promise.allSettled([downloadQueue.onIdle(), reactQueue.onIdle()]);
     redis.sendCommand(["SAVE"]);
-    await Promise.allSettled([
-      redis.quit(),
-      queue.onIdle(),
-      prisma.$disconnect(),
-    ]);
+    await Promise.allSettled([redis.quit(), prisma.$disconnect()]);
   } catch (err) {
     Sentry.captureException(err);
     log.error("Browser", `Error closing browser: ${(err as Error).message}`);

src/components/queue.ts src/components/queue/download.tssrc/components/queue.ts renamed to src/components/queue/download.ts

@@ -0,0 +1,17 @@
+import PQueue from "p-queue";
+
+declare global {
+  var _sharedQueue: PQueue;
+}
+
+if (!global._sharedQueue) {
+  global._sharedQueue = new PQueue({
+    // a user can only react 1 message at a time
+    // else its a bot
+    concurrency: 1,
+  });
+}
+
+const queue = global._sharedQueue;
+
+export default queue;

src/components/queue/react.ts

@@ -0,0 +1,41 @@
+import { sleep } from "groq-sdk/core";
+import { Message } from "../../../types/message";
+import log from "../log";
+import client from "../../client";
+import regex from "../../emoji";
+import { containsAny } from "../string";
+import { funD, happyEE, loveEE, sadEE } from "../../../data/reaction";
+
+async function react(react: Message, reaction: string): Promise<void> {
+  const min = 2000;
+  const max = 6000;
+  const randomMs = Math.floor(Math.random() * (max - min + 1)) + min;
+  const lid: string = react.author
+    ? react.author.split("@")[0]
+    : react.from.split("@")[0];
+
+  await sleep(randomMs);
+  const isEmoji = /.*[A-Za-z0-9].*/.test(reaction);
+  log.info("AutoReact", lid, reaction);
+
+  if (Math.random() < 0.1 && !isEmoji)
+    if (Math.random() < 0.2)
+      (await client()).sendMessage(react.id.remote, reaction);
+    else await react.reply(reaction);
+  else await react.react(reaction);
+}
+
+export default async function (msg: Message): Promise<void> {
+  const emojis = [...new Set([...msg.body.matchAll(regex)].map((m) => m[0]))];
+  if (emojis.length > 0) {
+    await react(msg, emojis[Math.floor(Math.random() * emojis.length)]);
+  } else if (containsAny(msg.body, funD)) {
+    await react(msg, "🤣");
+  } else if (containsAny(msg.body, happyEE)) {
+    await react(msg, funD[Math.floor(Math.random() * funD.length)]);
+  } else if (containsAny(msg.body, sadEE)) {
+    await react(msg, "😭");
+  } else if (containsAny(msg.body, loveEE)) {
+    await react(msg, "❤️");
+  }
+}