Feature/in 731

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS builder
+FROM node:20-alpine3.20 AS builder
 
 RUN apk update && \
     apk add git wget curl bash openssl
@@ -28,7 +28,7 @@ RUN ./Docker/scripts/generate_database.sh
 
 RUN npm run build
 
-FROM node:20-alpine AS final
+FROM node:20-alpine3.20 AS final
 
 RUN apk update && \
     apk add tzdata bash openssl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "2.2.1",
+  "version": "2.2.40",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/main.js",
   "type": "commonjs",
@@ -57,7 +57,7 @@
     "@sentry/node": "^8.47.0",
     "amqplib": "^0.10.5",
     "axios": "^1.7.9",
-    "baileys": "github:EvolutionAPI/Baileys",
+    "baileys": "github:WhiskeySockets/Baileys#f8a538eee293c38387c08b2ea97b22d9b61c9d55",
     "class-validator": "^0.14.1",
     "compression": "^1.7.5",
     "cors": "^2.8.5",

prisma/postgresql-migrations/20241105170512_web_version/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Instance" ADD COLUMN     "webVersion" VARCHAR(50);

prisma/postgresql-migrations/20250128200807_added_index_remotejid_on_is_on_whatsapp_table/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "IsOnWhatsapp_remoteJid_idx" ON "IsOnWhatsapp"("remoteJid");

prisma/postgresql-migrations/20250711181706_change_token_to_text/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Instance" ALTER COLUMN "token" SET DATA TYPE TEXT;

prisma/postgresql-schema.prisma

@@ -70,8 +70,9 @@ model Instance {
   integration             String?                  @db.VarChar(100)
   number                  String?                  @db.VarChar(100)
   businessId              String?                  @db.VarChar(100)
-  token                   String?                  @db.VarChar(255)
+  token                   String?                  @db.Text
   clientName              String?                  @db.VarChar(100)
+  webVersion              String?                  @db.VarChar(50)
   disconnectionReasonCode Int?                     @db.Integer
   disconnectionObject     Json?                    @db.JsonB
   disconnectionAt         DateTime?                @db.Timestamp
@@ -626,4 +627,5 @@ model IsOnWhatsapp {
   jidOptions String
   createdAt  DateTime @default(now()) @db.Timestamp
   updatedAt  DateTime @updatedAt @db.Timestamp
+  @@index([remoteJid])
 }

src/api/abstract/abstract.router.ts

@@ -41,6 +41,10 @@ export abstract class RouterBroker {
       Object.assign(instance, body);
     }
 
+    if (request.originalUrl.includes('/webhook/meta')) {
+      Object.assign(instance, body);
+    } 
+
     Object.assign(ref, body);
 
     const v = schema ? validate(ref, schema) : { valid: true, errors: [] };

src/api/controllers/group.controller.ts

@@ -35,7 +35,7 @@ export class GroupController {
   }
 
   public async findGroupInfo(instance: InstanceDto, groupJid: GroupJid) {
-    return await this.waMonitor.waInstances[instance.instanceName].findGroup(groupJid);
+    return await this.waMonitor.waInstances[instance.instanceName].getGroupMetadataCache(groupJid.groupJid);
   }
 
   public async fetchAllGroups(instance: InstanceDto, getPaticipants: GetParticipant) {

src/api/controllers/instance.controller.ts

@@ -131,7 +131,8 @@ export class InstanceController {
           throw new BadRequestException('number is required');
         }
         const urlServer = this.configService.get<HttpServer>('SERVER').URL;
-        webhookWaBusiness = `${urlServer}/webhook/meta`;
+        const webHookTest = this.configService.get<WaBusiness>('WA_BUSINESS').WEBHOOK_TEST;
+        webhookWaBusiness = `${webHookTest ? webHookTest : urlServer}/webhook/meta`;
         accessTokenWaBusiness = this.configService.get<WaBusiness>('WA_BUSINESS').TOKEN_WEBHOOK;
       }
 
@@ -285,6 +286,32 @@ export class InstanceController {
     return this.waMonitor.instanceInfo(instanceNames);
   }
 
+  public async getInstanceByName({ instanceName }: InstanceDto) {
+    const instanceByName = await this.prismaRepository.instance.findFirst({
+      where: {
+        name: instanceName,
+      },
+    });
+
+    if (!instanceByName) {
+      return null;
+    }
+
+    const response = {
+      id: instanceByName.id,
+      name: instanceByName.name,
+      ownerJid: instanceByName.ownerJid,
+      connectionStatus: instanceByName.connectionStatus,
+      profileName: instanceByName.profileName,
+    }
+    return response;
+  }
+
+  public async countInstances() {
+    const count = await this.prismaRepository.instance.count();
+    return count;
+  }
+
   public async setPresence({ instanceName }: InstanceDto, data: SetPresenceDto) {
     return await this.waMonitor.waInstances[instanceName].setPresence(data);
   }

src/api/guards/auth.guard.ts

@@ -20,7 +20,7 @@ async function apikey(req: Request, _: Response, next: NextFunction) {
     return next();
   }
 
-  if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
+  if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances') || req.originalUrl.includes('/instance/countInstances') || req.originalUrl.includes('/instance/instanceByName')) && !key) {
     throw new ForbiddenException('Missing global api key', 'The global api key must be set');
   }
   const param = req.params as unknown as InstanceDto;
@@ -34,7 +34,7 @@ async function apikey(req: Request, _: Response, next: NextFunction) {
         return next();
       }
     } else {
-      if (req.originalUrl.includes('/instance/fetchInstances') && db.SAVE_DATA.INSTANCE) {
+      if ((req.originalUrl.includes('/instance/fetchInstances') || req.originalUrl.includes('/instance/countInstances') || req.originalUrl.includes('/instance/instanceByName')) && db.SAVE_DATA.INSTANCE) {
         const instanceByKey = await prismaRepository.instance.findFirst({
           where: { token: key },
         });

src/api/guards/instance.guard.ts

@@ -23,7 +23,7 @@ async function getInstance(instanceName: string) {
 }
 
 export async function instanceExistsGuard(req: Request, _: Response, next: NextFunction) {
-  if (req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) {
+  if (req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances') || req.originalUrl.includes('/instance/countInstances') || req.originalUrl.includes('/instance/instanceByName')) {
     return next();
   }
 

src/api/integrations/channel/evolution/evolution.channel.service.ts

@@ -179,34 +179,34 @@ export class EvolutionStartupService extends ChannelStartupService {
 
     this.sendDataWebhook(Events.CONTACTS_UPSERT, contactRaw);
 
-    const chat = await this.prismaRepository.chat.findFirst({
-      where: { instanceId: this.instanceId, remoteJid: data.remoteJid },
-    });
-
-    if (chat) {
-      const chatRaw: any = {
-        remoteJid: data.remoteJid,
-        instanceId: this.instanceId,
-      };
-
-      this.sendDataWebhook(Events.CHATS_UPDATE, chatRaw);
-
-      await this.prismaRepository.chat.updateMany({
-        where: { remoteJid: chat.remoteJid },
-        data: chatRaw,
-      });
-    }
-
-    const chatRaw: any = {
-      remoteJid: data.remoteJid,
-      instanceId: this.instanceId,
-    };
-
-    this.sendDataWebhook(Events.CHATS_UPSERT, chatRaw);
-
-    await this.prismaRepository.chat.create({
-      data: chatRaw,
-    });
+    // const chat = await this.prismaRepository.chat.findFirst({
+    //   where: { instanceId: this.instanceId, remoteJid: data.remoteJid },
+    // });
+
+    // if (chat) {
+    //   const chatRaw: any = {
+    //     remoteJid: data.remoteJid,
+    //     instanceId: this.instanceId,
+    //   };
+
+    //   this.sendDataWebhook(Events.CHATS_UPDATE, chatRaw);
+
+    //   await this.prismaRepository.chat.updateMany({
+    //     where: { remoteJid: chat.remoteJid },
+    //     data: chatRaw,
+    //   });
+    // }
+
+    // const chatRaw: any = {
+    //   remoteJid: data.remoteJid,
+    //   instanceId: this.instanceId,
+    // };
+
+    // this.sendDataWebhook(Events.CHATS_UPSERT, chatRaw);
+
+    // await this.prismaRepository.chat.create({
+    //   data: chatRaw,
+    // });
   }
 
   protected async sendMessageWithTyping(number: string, message: any, options?: Options, file?: any) {

src/api/integrations/channel/meta/meta.controller.ts

@@ -15,6 +15,7 @@ export class MetaController extends ChannelController implements ChannelControll
   integrationEnabled: boolean;
 
   public async receiveWebhook(data: any) {
+    this.logger.info('VALOR DE DATA META: ' + JSON.stringify(data))
     if (data.object === 'whatsapp_business_account') {
       if (data.entry[0]?.changes[0]?.field === 'message_template_status_update') {
         const template = await this.prismaRepository.template.findFirst({

src/api/integrations/channel/meta/meta.router.ts

@@ -16,6 +16,17 @@ export class MetaRouter extends RouterBroker {
         const { body } = req;
         const response = await metaController.receiveWebhook(body);
 
+        return res.status(200).json(response);
+      })
+      .get(this.routerPath('webhook/whatsapp', false), async (req, res) => {
+        if (req.query['hub.verify_token'] === configService.get<WaBusiness>('WA_BUSINESS').TOKEN_WEBHOOK)
+          res.send(req.query['hub.challenge']);
+        else res.send('Error, wrong validation token');
+      })
+      .post(this.routerPath('webhook/whatsapp', false), async (req, res) => {
+        const { body } = req;
+        const response = await metaController.receiveWebhook(body);
+
         return res.status(200).json(response);
       });
   }