Merge branch 'ticketz-oss:main' into main

Author: henmohr

backend/package-lock.json

@@ -29,7 +29,7 @@
     "@types/lodash": "^4.17.1",
     "async-mutex": "^0.4.1",
     "axios": "^1.7.2",
-    "baileys": "^6.7.18",
+    "baileys": "6.7.18",
     "bcryptjs": "^2.4.3",
     "bull": "^4.12.2",
     "cookie-parser": "^1.4.6",

backend/package.json

@@ -7,12 +7,17 @@ import cookieParser from "cookie-parser";
 import * as Sentry from "@sentry/node";
 
 import "./database";
+import path from "path";
 import uploadConfig from "./config/upload";
 import AppError from "./errors/AppError";
 import routes from "./routes";
 import { logger } from "./utils/logger";
 import { messageQueue, sendScheduledMessages } from "./queues";
 
+class SystemError extends Error {
+  code?: string;
+}
+
 Sentry.init({ dsn: process.env.SENTRY_DSN });
 
 const app = express();
@@ -25,13 +30,34 @@ app.set("queues", {
 app.use(
   cors({
     credentials: true,
-    origin: process.env.FRONTEND_URL
+    origin: process.env.FRONTEND_URL,
+    exposedHeaders: ["Content-Range", "X-Content-Range"]
   })
 );
 app.use(cookieParser());
 app.use(express.json());
 app.use(Sentry.Handlers.requestHandler());
-app.use("/public", express.static(uploadConfig.directory));
+app.get("/public/*", (req, res) => {
+  const filePath = path.join(uploadConfig.directory, req.params[0]);
+
+  if (filePath.endsWith(".aac")) {
+    res.setHeader("Content-Type", "audio/aac");
+  }
+
+  res.download(filePath, (err: SystemError) => {
+    if (err) {
+      if (err.code === "ENOENT") {
+        res.status(404).end();
+      } else {
+        logger.debug(
+          { err },
+          `Error downloading file ${req.params[0]}: ${err.message}`
+        );
+        res.status(500).end();
+      }
+    }
+  });
+});
 
 app.use((req, _res, next) => {
   const { method, url, query, body, headers } = req;

backend/src/app.ts

@@ -24,6 +24,7 @@ import Ticket from "../models/Ticket";
 import ForwardMessageService from "../services/MessageServices/ForwardMessageService";
 import { getWbot } from "../libs/wbot";
 import { verifyMessage } from "../services/WbotServices/wbotMessageListener";
+import { getJidOf } from "../services/WbotServices/getJidOf";
 
 type IndexQuery = {
   pageNumber: string;
@@ -121,15 +122,12 @@ export const react = async (req: Request, res: Response): Promise<Response> => {
 
   const msg = JSON.parse(message.dataJson);
 
-  const sentMessage = await wbot.sendMessage(
-    ticket.contact.number + (ticket.isGroup ? "@g.us" : "@s.whatsapp.net"),
-    {
-      react: {
-        text: emoji,
-        key: msg.key
-      }
+  const sentMessage = await wbot.sendMessage(getJidOf(ticket), {
+    react: {
+      text: emoji,
+      key: msg.key
     }
-  );
+  });
 
   if (!sentMessage) {
     throw new AppError("ERR_WHATSAPP_MESSAGE_NOT_SENT", 500);

backend/src/controllers/MessageController.ts

@@ -77,10 +77,6 @@ export const remove = async (
   req: Request,
   res: Response
 ): Promise<Response> => {
-  const { id } = req.user;
-  const user = await User.findByPk(id);
-  await user.update({ online: false });
-
   res.clearCookie("jrt");
 
   return res.send();

backend/src/controllers/SessionController.ts

@@ -5,6 +5,7 @@ import Contact from "../models/Contact";
 import ContactTag from "../models/ContactTag";
 import Ticket from "../models/Ticket";
 import Whatsapp from "../models/Whatsapp";
+import WhatsappLidMap from "../models/WhatsappLidMap";
 import ContactCustomField from "../models/ContactCustomField";
 import Message from "../models/Message";
 import OldMessage from "../models/OldMessage";
@@ -54,6 +55,7 @@ const models = [
   Message,
   OldMessage,
   Whatsapp,
+  WhatsappLidMap,
   ContactCustomField,
   Setting,
   Queue,

backend/src/database/index.ts

@@ -0,0 +1,52 @@
+import { QueryInterface, DataTypes } from "sequelize";
+
+export default {
+  up: async (queryInterface: QueryInterface) => {
+    await queryInterface.createTable("WhatsappLidMaps", {
+      id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false
+      },
+      lid: {
+        type: DataTypes.STRING,
+        allowNull: false
+      },
+      companyId: {
+        type: DataTypes.INTEGER,
+        allowNull: false
+      },
+      contactId: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        references: {
+          model: "Contacts",
+          key: "id"
+        },
+        onDelete: "CASCADE",
+        onUpdate: "CASCADE"
+      },
+      createdAt: {
+        type: DataTypes.DATE,
+        allowNull: false
+      },
+      updatedAt: {
+        type: DataTypes.DATE,
+        allowNull: false
+      }
+    });
+
+    await queryInterface.addIndex("WhatsappLidMaps", ["lid"]);
+    await queryInterface.addIndex("WhatsappLidMaps", ["companyId"]);
+    await queryInterface.addConstraint("WhatsappLidMaps", {
+      fields: ["lid", "companyId"],
+      type: "unique",
+      name: "unique_lid_companyId"
+    });
+  },
+
+  down: async (queryInterface: QueryInterface) => {
+    return queryInterface.dropTable("WhatsappLidMaps");
+  }
+};

backend/src/database/migrations/20250612092900-create-whatsapp-lid-maps.ts

@@ -0,0 +1,14 @@
+import { QueryInterface } from "sequelize";
+
+export default {
+  up: async (queryInterface: QueryInterface) => {
+    await queryInterface.removeColumn("Users", "online");
+  },
+
+  down: async (queryInterface: QueryInterface) => {
+    await queryInterface.addColumn("Users", "online", {
+      type: "BOOLEAN",
+      allowNull: true
+    });
+  }
+};

backend/src/database/migrations/20250618151400-remove-online-from-users.ts

@@ -1,5 +1,4 @@
 import { WASocket, proto } from "baileys";
-import { cacheLayer } from "../libs/cache";
 import { getIO } from "../libs/socket";
 import Message from "../models/Message";
 import Ticket from "../models/Ticket";
@@ -8,7 +7,6 @@ import GetTicketWbot from "./GetTicketWbot";
 
 const SetTicketMessagesAsRead = async (ticket: Ticket): Promise<void> => {
   await ticket.update({ unreadMessages: 0 }, { silent: true });
-  await cacheLayer.set(`contacts:${ticket.contactId}:unreads`, "0");
   let companyId: number;
 
   try {
@@ -40,32 +38,39 @@ const SetTicketMessagesAsRead = async (ticket: Ticket): Promise<void> => {
       `Marking ${messageKeys.length} messages of ticket ${ticket.id} as read`
     );
 
-    // Process message keys in batches of 250
-    const batchSize = 250;
-    for (let i = 0; i < messageKeys.length; i += batchSize) {
-      const batch = messageKeys.slice(i, i + batchSize);
-      (wbot as WASocket).readMessages(batch).catch(err => {
-        logger.error(
-          { error: err as Error },
-          `Could not mark messages as read. Err: ${err?.message}`
-        );
-      });
-    }
-
-    const lastMessage: proto.IWebMessageInfo = JSON.parse(messages[0].dataJson);
-    if (lastMessage?.key?.remoteJid && !lastMessage.key.fromMe) {
-      // Asynchronous chatModify call
-      (wbot as WASocket)
-        .chatModify(
-          { markRead: true, lastMessages: [lastMessage] },
-          lastMessage.key.remoteJid
-        )
-        .catch(err => {
+    if (wbot) {
+      // Process message keys in batches of 250
+      const batchSize = 250;
+      for (let i = 0; i < messageKeys.length; i += batchSize) {
+        const batch = messageKeys.slice(i, i + batchSize);
+        try {
+          // eslint-disable-next-line no-await-in-loop
+          await (wbot as WASocket).readMessages(batch);
+        } catch (err) {
           logger.error(
             { error: err as Error },
-            `Could not modify chat. Err: ${err?.message}`
+            `Could not mark messages as read. Err: ${err?.message}`
           );
-        });
+        }
+      }
+
+      const lastMessage: proto.IWebMessageInfo = JSON.parse(
+        messages[0].dataJson
+      );
+      if (lastMessage?.key?.remoteJid && !lastMessage.key.fromMe) {
+        // Asynchronous chatModify call
+        (wbot as WASocket)
+          .chatModify(
+            { markRead: true, lastMessages: [lastMessage] },
+            lastMessage.key.remoteJid
+          )
+          .catch(err => {
+            logger.error(
+              { error: err as Error },
+              `Could not modify chat. Err: ${err?.message}`
+            );
+          });
+      }
     }
 
     await Message.update(

backend/src/helpers/SetTicketMessagesAsRead.ts

@@ -44,7 +44,7 @@ import { instrument } from "@socket.io/admin-ui";
 import { Server } from "http";
 import { verify } from "jsonwebtoken";
 import AppError from "../errors/AppError";
-import { logger } from "../utils/logger";
+import { logger, socketSendBuffer } from "../utils/logger";
 import User from "../models/User";
 import Queue from "../models/Queue";
 import Ticket from "../models/Ticket";
@@ -118,7 +118,6 @@ export const initIO = (httpServer: Server): SocketIO => {
     if (userId && userId !== "undefined" && userId !== "null") {
       user = await User.findByPk(userId, { include: [Queue] });
       if (user) {
-        user.online = true;
         await user.save();
       } else {
         logger.info(`onConnect: User ${userId} not found`);
@@ -172,6 +171,7 @@ export const initIO = (httpServer: Server): SocketIO => {
             "started transmission of backend logs"
           ]
         });
+        socketSendBuffer();
       } else {
         logger.info(`User ${user.id} tried to join superlog channel.`);
       }