NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-11 02:49:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(chatwoot): otimizar lógica de reabertura de conversas e notificação de conexão

Browse Source 
Este commit introduz melhorias na integração com o Chatwoot, focando na reabertura de conversas e na notificação de conexão. A lógica foi refatorada para centralizar a busca por conversas abertas e a reabertura de conversas resolvidas, garantindo que interações não sejam perdidas. Além disso, foi implementado um intervalo mínimo para notificações de conexão, evitando mensagens excessivas e melhorando a experiência do usuário.
This commit is contained in:
Vitordotpy 2025-09-28 22:38:45 -03:00
parent 0d8e8bc0fb
commit f7862637b1
1 changed files with 69 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
View File

@ -33,6 +33,8 @@ import mimeTypes from 'mime-types';
import path from 'path'; import path from 'path';
import { Readable } from 'stream'; import { Readable } from 'stream';
const MIN_CONNECTION_NOTIFICATION_INTERVAL_MS = 30000; // 30 seconds
interface ChatwootMessage { interface ChatwootMessage {
messageId?: number; messageId?: number;
inboxId?: number; inboxId?: number;
@ -747,43 +749,14 @@ export class ChatwootService {
return null; return null;
} }
let inboxConversation = null; let inboxConversation = this.findOpenConversation(contactConversations.payload, filterInbox.id);
if (this.provider.reopenConversation) { if (!inboxConversation && this.provider.reopenConversation) {
inboxConversation = contactConversations.payload.find( inboxConversation = await this.findAndReopenResolvedConversation(
(conversation) => client,
conversation && conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id, contactConversations.payload,
filterInbox.id,
); );
if (inboxConversation) {
this.logger.verbose(
`Found open conversation in reopenConversation mode: ${JSON.stringify(inboxConversation)}`,
);
} else {
inboxConversation = contactConversations.payload.find(
(conversation) => conversation.inbox_id == filterInbox.id,
);
if (inboxConversation) {
this.logger.verbose(`Found resolved conversation to reopen: ${JSON.stringify(inboxConversation)}`);
if (this.provider.conversationPending && inboxConversation.status !== 'open') {
await client.conversations.toggleStatus({
accountId: this.provider.accountId,
conversationId: inboxConversation.id,
data: {
status: 'pending',
},
});
this.logger.verbose(`Reopened resolved conversation ID: ${inboxConversation.id}`);
}
}
}
} else {
inboxConversation = contactConversations.payload.find(
(conversation) =>
conversation && conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
);
this.logger.verbose(`Found conversation: ${JSON.stringify(inboxConversation)}`);
} }
if (inboxConversation) { if (inboxConversation) {
@ -832,6 +805,45 @@ export class ChatwootService {
} }
} }
private findOpenConversation(conversations: any[], inboxId: number): any | null {
const openConversation = conversations.find(
(conversation) => conversation && conversation.status !== 'resolved' && conversation.inbox_id == inboxId,
);
if (openConversation) {
this.logger.verbose(`Found open conversation: ${JSON.stringify(openConversation)}`);
}
return openConversation || null;
}
private async findAndReopenResolvedConversation(
client: any,
conversations: any[],
inboxId: number,
): Promise<any | null> {
const resolvedConversation = conversations.find(
(conversation) => conversation && conversation.status === 'resolved' && conversation.inbox_id == inboxId,
);
if (resolvedConversation) {
this.logger.verbose(`Found resolved conversation to reopen: ${JSON.stringify(resolvedConversation)}`);
if (this.provider.conversationPending && resolvedConversation.status !== 'open') {
await client.conversations.toggleStatus({
accountId: this.provider.accountId,
conversationId: resolvedConversation.id,
data: {
status: 'pending',
},
});
this.logger.verbose(`Reopened resolved conversation ID: ${resolvedConversation.id}`);
}
return resolvedConversation;
}
return null;
}
public async getInbox(instance: InstanceDto): Promise<inbox | null> { public async getInbox(instance: InstanceDto): Promise<inbox | null> {
const cacheKey = `${instance.instanceName}:getInbox`; const cacheKey = `${instance.instanceName}:getInbox`;
if (await this.cache.has(cacheKey)) { if (await this.cache.has(cacheKey)) {
@ -2420,28 +2432,30 @@ export class ChatwootService {
await this.createBotMessage(instance, msgStatus, 'incoming'); await this.createBotMessage(instance, msgStatus, 'incoming');
} }
if (event === 'connection.update') { if (event === 'connection.update' && body.status === 'open') {
if (body.status === 'open') { const waInstance = this.waMonitor.waInstances[instance.instanceName];
const waInstance = this.waMonitor.waInstances[instance.instanceName]; if (!waInstance) return;
// if we have qrcode count then we understand that a new connection was established
if (waInstance && waInstance.qrCode.count > 0) {
const msgConnection = i18next.t('cw.inbox.connected');
await this.createBotMessage(instance, msgConnection, 'incoming');
waInstance.qrCode.count = 0;
waInstance.lastConnectionNotification = Date.now(); const now = Date.now();
const timeSinceLastNotification = now - (waInstance.lastConnectionNotification || 0);
chatwootImport.clearAll(instance); // Se a conexão foi estabelecida via QR code, notifica imediatamente.
} else if (waInstance) { if (waInstance.qrCode && waInstance.qrCode.count > 0) {
const timeSinceLastNotification = Date.now() - (waInstance.lastConnectionNotification || 0); const msgConnection = i18next.t('cw.inbox.connected');
const minIntervalMs = 30000; // 30 seconds await this.createBotMessage(instance, msgConnection, 'incoming');
waInstance.qrCode.count = 0;
if (timeSinceLastNotification < minIntervalMs) { waInstance.lastConnectionNotification = now;
this.logger.warn( chatwootImport.clearAll(instance);
`Connection notification skipped for ${instance.instanceName} - too frequent (${timeSinceLastNotification}ms since last)`, }
); // Se não foi via QR code, verifica o throttling.
} else if (timeSinceLastNotification >= MIN_CONNECTION_NOTIFICATION_INTERVAL_MS) {
} const msgConnection = i18next.t('cw.inbox.connected');
await this.createBotMessage(instance, msgConnection, 'incoming');
waInstance.lastConnectionNotification = now;
} else {
this.logger.warn(
`Connection notification skipped for ${instance.instanceName} - too frequent (${timeSinceLastNotification}ms since last)`,
);
} }
} }