Merge branch 'release/1.7.6'

Author: DavidsonGomes

.github/workflows/publish_docker_image.yml

@@ -2,52 +2,49 @@ name: Build Docker image
 
 on:
   push:
-    branches:
-      - develop
-      - main
     tags:
-      - v*
-  workflow_dispatch:
+      - "v*.*.*"
 
 jobs:
-  build:
+  build_deploy:
+    name: Build and Deploy
     runs-on: ubuntu-latest
-    env:
-      GIT_REF: ${{ github.head_ref || github.ref_name }} # ref_name to get tags/branches
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: atendai/evolution-api
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: set docker tag
-        run: |
-          echo "DOCKER_TAG=ghcr.io/atendai/evolution-api:$GIT_REF" >> $GITHUB_ENV
-
-      - name: replace docker tag if main
-        if: github.ref_name == 'main'
-        run: |
-          echo "DOCKER_TAG=ghcr.io/atendai/evolution-api:latest" >> $GITHUB_ENV
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        id: docker_build
+        uses: docker/build-push-action@v5
         with:
-          context: .
-          file: ./Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ env.DOCKER_TAG }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.8.0 (develop)
+
+### Feature
+
+* Now in the manager, when logging in with the client's apikey, the listing only shows the instance corresponding to the provided apikey (only with MongoDB)
+* New global mode for rabbitmq events
+
+### Fixed
+* Correction in message formatting when generated by AI as markdown in typebot
+
 # 1.7.5 (2024-05-21 08:50)
 
 ### Fixed

Docker/.env.example

@@ -47,9 +47,33 @@ DATABASE_SAVE_DATA_CONTACTS=false
 DATABASE_SAVE_DATA_CHATS=false
 
 RABBITMQ_ENABLED=false
-RABBITMQ_RABBITMQ_MODE=global
-RABBITMQ_EXCHANGE_NAME=evolution_exchange
 RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+RABBITMQ_EXCHANGE_NAME=evolution_exchange
+RABBITMQ_GLOBAL_ENABLED=false
+RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+RABBITMQ_EVENTS_QRCODE_UPDATED=true
+RABBITMQ_EVENTS_MESSAGES_SET=true
+RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+RABBITMQ_EVENTS_MESSAGES_DELETE=true
+RABBITMQ_EVENTS_SEND_MESSAGE=true
+RABBITMQ_EVENTS_CONTACTS_SET=true
+RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+RABBITMQ_EVENTS_CHATS_SET=true
+RABBITMQ_EVENTS_CHATS_UPSERT=true
+RABBITMQ_EVENTS_CHATS_UPDATE=true
+RABBITMQ_EVENTS_CHATS_DELETE=true
+RABBITMQ_EVENTS_GROUPS_UPSERT=true
+RABBITMQ_EVENTS_GROUPS_UPDATE=true
+RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+RABBITMQ_EVENTS_LABELS_EDIT=true
+RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+RABBITMQ_EVENTS_CALL=true
+RABBITMQ_EVENTS_TYPEBOT_START=false
+RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false
 
 WEBSOCKET_ENABLED=false
 WEBSOCKET_GLOBAL_EVENTS=false
@@ -125,7 +149,7 @@ CHATWOOT_MESSAGE_DELETE=false # false | true
 # If you leave this option as true, when sending a message in Chatwoot, the client's last message will be marked as read on WhatsApp.
 CHATWOOT_MESSAGE_READ=false # false | true
 # This db connection is used to import messages from whatsapp to chatwoot database
-CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname
+CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname?sslmode=disable
 CHATWOOT_IMPORT_DATABASE_PLACEHOLDER_MEDIA_MESSAGE=true
 
 CACHE_REDIS_ENABLED=false

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20.7.0-alpine AS builder
 
-LABEL version="1.7.5" description="Api to control whatsapp features through http requests." 
+LABEL version="1.8.0" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="contato@agenciadgcode.com"
 
@@ -59,9 +59,35 @@ ENV DATABASE_SAVE_DATA_CONTACTS=false
 ENV DATABASE_SAVE_DATA_CHATS=false
 
 ENV RABBITMQ_ENABLED=false
-ENV RABBITMQ_MODE=global
-ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
 ENV RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
+ENV RABBITMQ_GLOBAL_ENABLED=false
+ENV RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+ENV RABBITMQ_EVENTS_INSTANCE_CREATE=false
+ENV RABBITMQ_EVENTS_INSTANCE_DELETE=false
+ENV RABBITMQ_EVENTS_QRCODE_UPDATED=true
+ENV RABBITMQ_EVENTS_MESSAGES_SET=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+ENV RABBITMQ_EVENTS_MESSAGES_DELETE=true
+ENV RABBITMQ_EVENTS_SEND_MESSAGE=true
+ENV RABBITMQ_EVENTS_CONTACTS_SET=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+ENV RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_SET=true
+ENV RABBITMQ_EVENTS_CHATS_UPSERT=true
+ENV RABBITMQ_EVENTS_CHATS_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_DELETE=true
+ENV RABBITMQ_EVENTS_GROUPS_UPSERT=true
+ENV RABBITMQ_EVENTS_GROUPS_UPDATE=true
+ENV RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+ENV RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+ENV RABBITMQ_EVENTS_LABELS_EDIT=true
+ENV RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+ENV RABBITMQ_EVENTS_CALL=true
+ENV RABBITMQ_EVENTS_TYPEBOT_START=false
+ENV RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false
 
 ENV WEBSOCKET_ENABLED=false
 ENV WEBSOCKET_GLOBAL_EVENTS=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.7.5",
+  "version": "1.8.0",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {

src/api/controllers/instance.controller.ts

@@ -3,9 +3,9 @@ import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
 import { v4 } from 'uuid';
 
-import { ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
+import { Auth, ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
-import { BadRequestException, InternalServerErrorException } from '../../exceptions';
+import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
 import { ChatwootService } from '../integrations/chatwoot/services/chatwoot.service';
 import { RabbitmqService } from '../integrations/rabbitmq/services/rabbitmq.service';
@@ -679,11 +679,26 @@ export class InstanceController {
     };
   }
 
-  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto) {
-    if (instanceName) {
-      this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
-      this.logger.verbose('instanceName: ' + instanceName);
-      return this.waMonitor.instanceInfo(instanceName);
+  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto, key: string) {
+    const env = this.configService.get<Auth>('AUTHENTICATION').API_KEY;
+
+    let name = instanceName;
+    let arrayReturn = false;
+
+    if (env.KEY !== key) {
+      const instanceByKey = await this.repository.auth.findByKey(key);
+      if (instanceByKey) {
+        name = instanceByKey._id;
+        arrayReturn = true;
+      } else {
+        throw new UnauthorizedException();
+      }
+    }
+
+    if (name) {
+      this.logger.verbose('requested fetchInstances from ' + name + ' instance');
+      this.logger.verbose('instanceName: ' + name);
+      return this.waMonitor.instanceInfo(name, arrayReturn);
     } else if (instanceId || number) {
       return this.waMonitor.instanceInfoById(instanceId, number);
     }

src/api/guards/auth.guard.ts

@@ -59,19 +59,32 @@ async function apikey(req: Request, _: Response, next: NextFunction) {
   const env = configService.get<Auth>('AUTHENTICATION').API_KEY;
   const key = req.get('apikey');
 
+  if (!key) {
+    throw new UnauthorizedException();
+  }
+
   if (env.KEY === key) {
     return next();
   }
 
   if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
     throw new ForbiddenException('Missing global api key', 'The global api key must be set');
   }
+  const param = req.params as unknown as InstanceDto;
 
   try {
-    const param = req.params as unknown as InstanceDto;
-    const instanceKey = await repository.auth.find(param.instanceName);
-    if (instanceKey.apikey === key) {
-      return next();
+    if (param?.instanceName) {
+      const instanceKey = await repository.auth.find(param.instanceName);
+      if (instanceKey?.apikey === key) {
+        return next();
+      }
+    } else {
+      if (req.originalUrl.includes('/instance/fetchInstances')) {
+        const instanceByKey = await repository.auth.findByKey(key);
+        if (instanceByKey) {
+          return next();
+        }
+      }
     }
   } catch (error) {
     logger.error(error);

src/api/integrations/rabbitmq/libs/amqp.server.ts

@@ -42,6 +42,41 @@ export const getAMQP = (): amqp.Channel | null => {
   return amqpChannel;
 };
 
+export const initGlobalQueues = () => {
+  logger.info('Initializing global queues');
+  const events = configService.get<Rabbitmq>('RABBITMQ').EVENTS;
+
+  if (!events) {
+    logger.warn('No events to initialize on AMQP');
+    return;
+  }
+
+  const eventKeys = Object.keys(events);
+
+  eventKeys.forEach((event) => {
+    if (events[event] === false) return;
+
+    const queueName = `${event.replace(/_/g, '.').toLowerCase()}`;
+    const amqp = getAMQP();
+    const exchangeName = 'evolution_exchange';
+
+    amqp.assertExchange(exchangeName, 'topic', {
+      durable: true,
+      autoDelete: false,
+    });
+
+    amqp.assertQueue(queueName, {
+      durable: true,
+      autoDelete: false,
+      arguments: {
+        'x-queue-type': 'quorum',
+      },
+    });
+
+    amqp.bindQueue(queueName, exchangeName, event);
+  });
+};
+
 export const initQueues = (instanceName: string, events: string[]) => {
   if (!events || !events.length) return;
 

src/api/integrations/typebot/services/typebot.service.ts

@@ -519,18 +519,32 @@ export class TypebotService {
         text += element.text;
       }
 
-      if (
-        element.children &&
-        (element.type === 'p' ||
-          element.type === 'a' ||
-          element.type === 'inline-variable' ||
-          element.type === 'variable')
-      ) {
+      if (element.children && element.type !== 'a') {
         for (const child of element.children) {
           text += applyFormatting(child);
         }
       }
 
+      if (element.type === 'p') {
+        text = text.trim() + '\n';
+      }
+
+      if (element.type === 'ol') {
+        text =
+          '\n' +
+          text
+            .split('\n')
+            .map((line, index) => (line ? `${index + 1}. ${line}` : ''))
+            .join('\n');
+      }
+
+      if (element.type === 'li') {
+        text = text
+          .split('\n')
+          .map((line) => (line ? `  ${line}` : ''))
+          .join('\n');
+      }
+
       let formats = '';
 
       if (element.bold) {

src/api/repository/auth.repository.ts

@@ -68,6 +68,20 @@ export class AuthRepository extends Repository {
     }
   }
 
+  public async findByKey(key: string): Promise<AuthRaw> {
+    try {
+      this.logger.verbose('finding auth');
+      if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding auth in db');
+        return await this.authModel.findOne({ apikey: key });
+      }
+
+      return {};
+    } catch (error) {
+      return {};
+    }
+  }
+
   public async list(): Promise<AuthRaw[]> {
     try {
       if (this.dbSettings.ENABLED) {