From bfa7d429bd1d2f2cfea4d486624407d72ad9bf0f Mon Sep 17 00:00:00 2001 From: jaison-x Date: Thu, 28 Dec 2023 14:43:50 -0300 Subject: [PATCH] refactor(chatwoot): remove message ids cache in chatwoot to use chatwoot's api itself. Remove use of disc cache to optimize performance. BREAKING CHANGE: to make this, we need to use the param `source_id` from message in chatwoot. This param is only available from api in chatwoot version => 3.4.0. --- .../controllers/chatwoot.controller.ts | 4 +- .../controllers/instance.controller.ts | 6 --- src/whatsapp/services/chatwoot.service.ts | 53 ++----------------- src/whatsapp/services/whatsapp.service.ts | 4 +- 4 files changed, 7 insertions(+), 60 deletions(-) diff --git a/src/whatsapp/controllers/chatwoot.controller.ts b/src/whatsapp/controllers/chatwoot.controller.ts index d1090956..8f59ccac 100644 --- a/src/whatsapp/controllers/chatwoot.controller.ts +++ b/src/whatsapp/controllers/chatwoot.controller.ts @@ -7,7 +7,7 @@ import { ChatwootDto } from '../dto/chatwoot.dto'; import { InstanceDto } from '../dto/instance.dto'; import { RepositoryBroker } from '../repository/repository.manager'; import { ChatwootService } from '../services/chatwoot.service'; -import { instanceController } from '../whatsapp.module'; +import { waMonitor } from '../whatsapp.module'; const logger = new Logger('ChatwootController'); @@ -94,7 +94,7 @@ export class ChatwootController { public async receiveWebhook(instance: InstanceDto, data: any) { logger.verbose('requested receiveWebhook from ' + instance.instanceName + ' instance'); - const chatwootService = instanceController.getChatwootService(); + const chatwootService = new ChatwootService(waMonitor, this.configService, this.repository); return chatwootService.receiveWebhook(instance, data); } diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts index d15e5c2b..0f06895e 100644 --- a/src/whatsapp/controllers/instance.controller.ts +++ b/src/whatsapp/controllers/instance.controller.ts @@ -659,10 +659,4 @@ export class InstanceController { this.logger.verbose('requested refreshToken'); return await this.authService.refreshToken(oldToken); } - - public getChatwootService() { - this.logger.verbose('getting chatwootService object instance'); - - return this.chatwootService; - } } diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index c62597f7..63c04b6f 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -17,8 +17,6 @@ import { Events } from '../types/wa.types'; import { WAMonitoringService } from './monitor.service'; export class ChatwootService { - private messageCache: Record>; - private readonly logger = new Logger(ChatwootService.name); private provider: any; @@ -27,35 +25,7 @@ export class ChatwootService { private readonly waMonitor: WAMonitoringService, private readonly configService: ConfigService, private readonly repository: RepositoryBroker, - ) { - // messageCache is used to support Chatwoot version <= 3.3.1. - // after this version we can remove use of message cache and use source_id to check webhook needs to be ignored - this.messageCache = {}; - } - - private isMessageInCache(instance: InstanceDto, id: number, remove = true) { - this.logger.verbose('check if message is in cache'); - if (!this.messageCache[instance.instanceName]) { - return false; - } - - const hasId = this.messageCache[instance.instanceName].has(id); - - if (remove) { - this.messageCache[instance.instanceName].delete(id); - } - - return hasId; - } - - private addMessageToCache(instance: InstanceDto, id: number) { - this.logger.verbose('add message to cache'); - - if (!this.messageCache[instance.instanceName]) { - this.messageCache[instance.instanceName] = new Set(); - } - this.messageCache[instance.instanceName].add(id); - } + ) {} private async getProvider(instance: InstanceDto) { this.logger.verbose('get provider to instance: ' + instance.instanceName); @@ -1112,14 +1082,8 @@ export class ChatwootService { if (body.message_type === 'outgoing' && body?.conversation?.messages?.length && chatId !== '123456') { this.logger.verbose('check if is group'); - // messageCache is used to support Chatwoot version <= 3.3.1. - // after this version we can remove use of message cache and use only source_id value check - // use of source_id is better for performance - if ( - body?.conversation?.messages[0]?.source_id?.substring(0, 5) === 'WAID:' || - this.isMessageInCache(instance, body.id) - ) { - this.logger.verbose('message is cached'); + if (body?.conversation?.messages[0]?.source_id?.substring(0, 5) === 'WAID:') { + this.logger.verbose('message sent directly from whatsapp. Webhook ignored.'); return { message: 'bot' }; } @@ -1607,8 +1571,6 @@ export class ChatwootService { return; } - this.addMessageToCache(instance, send.id); - return send; } else { this.logger.verbose('message is not group'); @@ -1629,8 +1591,6 @@ export class ChatwootService { return; } - this.addMessageToCache(instance, send.id); - return send; } } @@ -1655,7 +1615,6 @@ export class ChatwootService { this.logger.warn('message not sent'); return; } - this.addMessageToCache(instance, send.id); } return; @@ -1713,8 +1672,6 @@ export class ChatwootService { return; } - this.addMessageToCache(instance, send.id); - return send; } @@ -1750,8 +1707,6 @@ export class ChatwootService { return; } - this.addMessageToCache(instance, send.id); - return send; } else { this.logger.verbose('message is not group'); @@ -1773,8 +1728,6 @@ export class ChatwootService { return; } - this.addMessageToCache(instance, send.id); - return send; } } diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index ce355486..f222d5b7 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -75,7 +75,6 @@ import { getIO } from '../../libs/socket.server'; import { getSQS, removeQueues as removeQueuesSQS } from '../../libs/sqs.server'; import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db'; import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db'; -import { instanceController } from '../../whatsapp/whatsapp.module'; import { ArchiveChatDto, DeleteMessage, @@ -132,6 +131,7 @@ import { RepositoryBroker } from '../repository/repository.manager'; import { Events, MessageSubtype, TypeMediaMessage, wa } from '../types/wa.types'; import { waMonitor } from '../whatsapp.module'; import { ChamaaiService } from './chamaai.service'; +import { ChatwootService } from './chatwoot.service'; import { TypebotService } from './typebot.service'; const retryCache = {}; @@ -169,7 +169,7 @@ export class WAStartupService { private phoneNumber: string; - private chatwootService = instanceController.getChatwootService(); + private chatwootService = new ChatwootService(waMonitor, this.configService, this.repository); private typebotService = new TypebotService(waMonitor, this.configService, this.eventEmitter);