diff --git a/package.json b/package.json index 0907228d..705138ca 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "cross-env": "^7.0.3", "dayjs": "^1.11.7", "eventemitter2": "^6.4.9", - "evolution-manager": "^0.4.11", + "evolution-manager": "^0.4.13", "exiftool-vendored": "^22.0.0", "express": "^4.18.2", "express-async-errors": "^3.1.1", diff --git a/src/libs/amqp.server.ts b/src/libs/amqp.server.ts index fc95b33c..b76d2d10 100644 --- a/src/libs/amqp.server.ts +++ b/src/libs/amqp.server.ts @@ -10,6 +10,7 @@ let amqpChannel: amqp.Channel | null = null; export const initAMQP = () => { return new Promise((resolve, reject) => { const uri = configService.get('RABBITMQ').URI; + const exchangeName = configService.get('RABBITMQ').EXCHANGE_NAME ?? 'evolution_exchange'; amqp.connect(uri, (error, connection) => { if (error) { reject(error); @@ -22,8 +23,6 @@ export const initAMQP = () => { return; } - const exchangeName = 'evolution_exchange'; - channel.assertExchange(exchangeName, 'topic', { durable: true, autoDelete: false, @@ -51,7 +50,7 @@ export const initQueues = (instanceName: string, events: string[]) => { queues.forEach((event) => { const amqp = getAMQP(); - const exchangeName = instanceName ?? 'evolution_exchange'; + const exchangeName = configService.get('RABBITMQ').EXCHANGE_NAME ?? instanceName; amqp.assertExchange(exchangeName, 'topic', { durable: true, @@ -81,7 +80,7 @@ export const removeQueues = (instanceName: string, events: string[]) => { return `${event.replace(/_/g, '.').toLowerCase()}`; }); - const exchangeName = instanceName ?? 'evolution_exchange'; + const exchangeName = configService.get('RABBITMQ').EXCHANGE_NAME ?? instanceName; queues.forEach((event) => { const amqp = getAMQP(); diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 29c58f6c..f861df2d 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -13,6 +13,7 @@ import { Database, HttpServer, Log, + Rabbitmq, Sqs, Webhook, Websocket, @@ -685,7 +686,7 @@ export class WAStartupService { if (amqp) { if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) { - const exchangeName = this.instanceName ?? 'evolution_exchange'; + const exchangeName = this.configService.get('RABBITMQ').EXCHANGE_NAME ?? this.instanceName; amqp.assertExchange(exchangeName, 'topic', { durable: true,