NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-23 04:22:02 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release/1.7.0'

Browse Source
This commit is contained in:
Davidson Gomes 2024-03-27 16:36:26 -03:00
commit b87558d301
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/whatsapp/services/whatsapp.baileys.service.ts
View File

@ -472,7 +472,7 @@ export class BaileysStartupService extends WAStartupService {
if (this.localProxy.enabled) { if (this.localProxy.enabled) {
this.logger.info('Proxy enabled: ' + this.localProxy.proxy); this.logger.info('Proxy enabled: ' + this.localProxy.proxy);
if (this.localProxy.proxy.host.includes('proxyscrape')) { if (this.localProxy?.proxy?.host?.includes('proxyscrape')) {
try { try {
const response = await axios.get(this.localProxy.proxy.host); const response = await axios.get(this.localProxy.proxy.host);
const text = response.data; const text = response.data;

25
src/whatsapp/services/whatsapp.service.ts
View File

@ -663,6 +663,18 @@ export class WAStartupService {
}; };
} }
private assertExchangeAsync = (channel, exchangeName, exchangeType, options) => {
return new Promise((resolve, reject) => {
channel.assertExchange(exchangeName, exchangeType, options, (error, ok) => {
if (error) {
reject(error);
} else {
resolve(ok);
}
});
});
};
public async sendDataWebhook<T = any>(event: Events, data: T, local = true) { public async sendDataWebhook<T = any>(event: Events, data: T, local = true) {
const webhookGlobal = this.configService.get<Webhook>('WEBHOOK'); const webhookGlobal = this.configService.get<Webhook>('WEBHOOK');
const webhookLocal = this.localWebhook.events; const webhookLocal = this.localWebhook.events;
@ -687,14 +699,19 @@ export class WAStartupService {
if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) { if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) {
const exchangeName = this.instanceName ?? 'evolution_exchange'; const exchangeName = this.instanceName ?? 'evolution_exchange';
amqp.assertExchange(exchangeName, 'topic', { // await amqp.assertExchange(exchangeName, 'topic', {
// durable: true,
// autoDelete: false,
// });
await this.assertExchangeAsync(amqp, exchangeName, 'topic', {
durable: true, durable: true,
autoDelete: false, autoDelete: false,
}); });
const queueName = `${this.instanceName}.${event}`; const queueName = `${this.instanceName}.${event}`;
amqp.assertQueue(queueName, { await amqp.assertQueue(queueName, {
durable: true, durable: true,
autoDelete: false, autoDelete: false,
arguments: { arguments: {
@ -702,7 +719,7 @@ export class WAStartupService {
}, },
}); });
amqp.bindQueue(queueName, exchangeName, event); await amqp.bindQueue(queueName, exchangeName, event);
const message = { const message = {
event, event,
@ -717,7 +734,7 @@ export class WAStartupService {
message['apikey'] = instanceApikey; message['apikey'] = instanceApikey;
} }
amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message))); await amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message)));
if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) { if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
const logData = { const logData = {