From 7289c3d7f9afbd3c563d4120c4f0cc78710942b5 Mon Sep 17 00:00:00 2001 From: raimartinsb Date: Thu, 31 Aug 2023 07:52:36 -0300 Subject: [PATCH 1/4] Add source_id and update message --- package.json | 2 +- src/whatsapp/models/message.model.ts | 2 + src/whatsapp/services/chatwoot.service.ts | 91 +++++++++++++++++++++-- src/whatsapp/services/whatsapp.service.ts | 1 + 4 files changed, 88 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6f92aaf3..c28271ca 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "dependencies": { "@adiwajshing/keyed-db": "^0.2.4", "@ffmpeg-installer/ffmpeg": "^1.1.0", - "@figuro/chatwoot-sdk": "^1.1.14", + "@figuro/chatwoot-sdk": "github:raimartinsb/chatwoot-sdk", "@hapi/boom": "^10.0.1", "@sentry/node": "^7.59.2", "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys", diff --git a/src/whatsapp/models/message.model.ts b/src/whatsapp/models/message.model.ts index a5790be7..252cd6e4 100644 --- a/src/whatsapp/models/message.model.ts +++ b/src/whatsapp/models/message.model.ts @@ -20,6 +20,8 @@ export class MessageRaw { messageTimestamp?: number | Long.Long; owner: string; source?: 'android' | 'web' | 'ios'; + source_id?: string; + source_reply_id?: string; } const messageSchema = new Schema({ diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 4dc9215c..b489a2c6 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -608,6 +608,8 @@ export class ChatwootService { conversationId: number, content: string, messageType: 'incoming' | 'outgoing' | undefined, + source_id?: string, + source_reply_id?: string, privateMessage?: boolean, attachments?: { content: unknown; @@ -633,6 +635,8 @@ export class ChatwootService { message_type: messageType, attachments: attachments, private: privateMessage || false, + source_id: source_id, + source_reply_id: source_reply_id, }, }); @@ -909,10 +913,10 @@ export class ChatwootService { }, }; - await waInstance?.audioWhatsapp(data); + const audioWhatsapp = await waInstance?.audioWhatsapp(data); this.logger.verbose('audio sent'); - return; + return audioWhatsapp; } this.logger.verbose('send media to instance: ' + waInstance.instanceName); @@ -934,10 +938,10 @@ export class ChatwootService { data.mediaMessage.caption = caption; } - await waInstance?.mediaMessage(data); + const mediaMessage = await waInstance?.mediaMessage(data); this.logger.verbose('media sent'); - return; + return mediaMessage; } catch (error) { this.logger.error(error); } @@ -1067,7 +1071,18 @@ export class ChatwootService { }, }; - await waInstance?.textMessage(data); + const message = await waInstance?.textMessage(data); + const conversationId = body?.conversation?.id; + const messageId = body?.id; + const dataUpdated = { + source_id: message.key.id, + }; + await client.messages.update({ + accountId: this.provider.account_id, + conversationId, + data: dataUpdated, + messageId, + }); } } } @@ -1142,6 +1157,38 @@ export class ChatwootService { return types; } + private getContextIdTypeMessage(msg: any) { + this.logger.verbose('get type message'); + + const types = { + conversation: msg.conversation?.contextInfo?.stanzaId, + imageMessage: msg.imageMessage?.contextInfo?.stanzaId, + videoMessage: msg.videoMessage?.contextInfo?.stanzaId, + extendedTextMessage: msg.extendedTextMessage?.contextInfo?.stanzaId, + messageContextInfo: msg.messageContextInfo?.stanzaId, + stickerMessage: undefined, + documentMessage: msg.documentMessage?.contextInfo?.stanzaId, + documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.contextInfo?.stanzaId, + audioMessage: msg.audioMessage?.contextInfo?.stanzaId, + contactMessage: msg.contactMessage?.vcard, + contactsArrayMessage: msg.contactsArrayMessage, + locationMessage: msg.locationMessage, + liveLocationMessage: msg.liveLocationMessage, + }; + + this.logger.verbose('type message: ' + types); + + return types; + } + + private getContextMessageContent(types: any) { + this.logger.verbose('get message content'); + const typeKey = Object.keys(types).find((key) => types[key] !== undefined); + + const result = typeKey ? types[typeKey] : undefined; + return result; + } + private getMessageContent(types: any) { this.logger.verbose('get message content'); const typeKey = Object.keys(types).find((key) => types[key] !== undefined); @@ -1241,6 +1288,18 @@ export class ChatwootService { return messageContent; } + private getContextConversationMessage(msg: any) { + this.logger.verbose('get context conversation message'); + + const types = this.getContextIdTypeMessage(msg); + + const messageContent = this.getContextMessageContent(types); + + this.logger.verbose('context conversation message: ' + messageContent); + + return messageContent; + } + public async eventWhatsapp(event: string, instance: InstanceDto, body: any) { this.logger.verbose('event whatsapp to instance: ' + instance.instanceName); try { @@ -1269,6 +1328,8 @@ export class ChatwootService { this.logger.verbose('get conversation message'); const bodyMessage = await this.getConversationMessage(body.message); + const source_reply_id = this.getContextConversationMessage(body.message); + const isMedia = this.isMediaMessage(body.message); if (!bodyMessage && !isMedia) { @@ -1286,6 +1347,8 @@ export class ChatwootService { const messageType = body.key.fromMe ? 'outgoing' : 'incoming'; + const source_id = body.key?.id; + this.logger.verbose('message type: ' + messageType); this.logger.verbose('is media: ' + isMedia); @@ -1387,7 +1450,14 @@ export class ChatwootService { } this.logger.verbose('send data to chatwoot'); - const send = await this.createMessage(instance, getConversion, content, messageType); + const send = await this.createMessage( + instance, + getConversion, + content, + messageType, + source_id, + source_reply_id, + ); if (!send) { this.logger.warn('message not sent'); @@ -1408,7 +1478,14 @@ export class ChatwootService { this.logger.verbose('message is not group'); this.logger.verbose('send data to chatwoot'); - const send = await this.createMessage(instance, getConversion, bodyMessage, messageType); + const send = await this.createMessage( + instance, + getConversion, + bodyMessage, + messageType, + source_id, + source_reply_id, + ); if (!send) { this.logger.warn('message not sent'); diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index d11946ee..f6a86f04 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -1992,6 +1992,7 @@ export class WAStartupService { messageTimestamp: messageSent.messageTimestamp as number, owner: this.instance.name, source: getDevice(messageSent.key.id), + source_id: messageSent.key.id, }; this.logger.log(messageRaw); From bd0a47964502994f1eaa615e241da2fe2c46015c Mon Sep 17 00:00:00 2001 From: raimartinsb Date: Wed, 6 Sep 2023 09:11:15 -0300 Subject: [PATCH 2/4] added source_id in media messages --- package.json | 2 +- src/whatsapp/services/chatwoot.service.ts | 29 +++++++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index c28271ca..282265a9 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "dependencies": { "@adiwajshing/keyed-db": "^0.2.4", "@ffmpeg-installer/ffmpeg": "^1.1.0", - "@figuro/chatwoot-sdk": "github:raimartinsb/chatwoot-sdk", + "@figuro/chatwoot-sdk": "^1.1.16", "@hapi/boom": "^10.0.1", "@sentry/node": "^7.59.2", "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys", diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index b489a2c6..7061f866 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -732,6 +732,8 @@ export class ChatwootService { file: string, messageType: 'incoming' | 'outgoing' | undefined, content?: string, + source_id?: string, + source_reply_id?: string, ) { this.logger.verbose('send data to chatwoot'); @@ -748,6 +750,12 @@ export class ChatwootService { this.logger.verbose('temp file found'); data.append('attachments[]', createReadStream(file)); + this.logger.verbose('message context: ' + source_id); + data.append('source_id', source_id); + + this.logger.verbose('message reply context: ' + source_reply_id); + data.append('source_reply_id', source_reply_id); + this.logger.verbose('get client to instance: ' + this.provider.instanceName); const config = { method: 'post', @@ -1170,10 +1178,10 @@ export class ChatwootService { documentMessage: msg.documentMessage?.contextInfo?.stanzaId, documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.contextInfo?.stanzaId, audioMessage: msg.audioMessage?.contextInfo?.stanzaId, - contactMessage: msg.contactMessage?.vcard, - contactsArrayMessage: msg.contactsArrayMessage, - locationMessage: msg.locationMessage, - liveLocationMessage: msg.liveLocationMessage, + contactMessage: msg.contactMessage?.contextInfo?.stanzaId, + contactsArrayMessage: msg.contactsArrayMessage?.contextInfo?.stanzaId, + locationMessage: msg.locationMessage?.contextInfo?.stanzaId, + liveLocationMessage: msg.liveLocationMessage?.contextInfo?.stanzaId, }; this.logger.verbose('type message: ' + types); @@ -1182,7 +1190,7 @@ export class ChatwootService { } private getContextMessageContent(types: any) { - this.logger.verbose('get message content'); + this.logger.verbose('get message context content'); const typeKey = Object.keys(types).find((key) => types[key] !== undefined); const result = typeKey ? types[typeKey] : undefined; @@ -1393,7 +1401,7 @@ export class ChatwootService { } this.logger.verbose('send data to chatwoot'); - const send = await this.sendData(getConversion, fileName, messageType, content); + const send = await this.sendData(getConversion, fileName, messageType, content, source_id, source_reply_id); if (!send) { this.logger.warn('message not sent'); @@ -1414,7 +1422,14 @@ export class ChatwootService { this.logger.verbose('message is not group'); this.logger.verbose('send data to chatwoot'); - const send = await this.sendData(getConversion, fileName, messageType, bodyMessage); + const send = await this.sendData( + getConversion, + fileName, + messageType, + bodyMessage, + source_id, + source_reply_id, + ); if (!send) { this.logger.warn('message not sent'); From cb942e512dfad64d2cc399952810e16f14ce7776 Mon Sep 17 00:00:00 2001 From: raimartinsb Date: Wed, 6 Sep 2023 13:28:42 -0300 Subject: [PATCH 3/4] improved message update --- src/whatsapp/services/chatwoot.service.ts | 67 ++++++++++++++++------- src/whatsapp/services/whatsapp.service.ts | 1 - 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 7061f866..56a90f67 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -750,11 +750,15 @@ export class ChatwootService { this.logger.verbose('temp file found'); data.append('attachments[]', createReadStream(file)); - this.logger.verbose('message context: ' + source_id); - data.append('source_id', source_id); + if (source_id) { + this.logger.verbose('source_id found'); + data.append('source_id', source_id); + } - this.logger.verbose('message reply context: ' + source_reply_id); - data.append('source_reply_id', source_reply_id); + if (source_reply_id) { + this.logger.verbose('source_reply_id found'); + data.append('source_reply_id', source_reply_id); + } this.logger.verbose('get client to instance: ' + this.provider.instanceName); const config = { @@ -955,6 +959,35 @@ export class ChatwootService { } } + public async updateMessage( + instance: InstanceDto, + accountId: number, + conversationId: number, + messageId: number, + sourceId: string | null, + ) { + this.logger.verbose('update message to chatwoot instance: ' + instance.instanceName); + const client = await this.clientCw(instance); + + if (!client) { + this.logger.warn('client not found'); + return null; + } + this.logger.verbose('check if sourceId to update'); + if (sourceId) { + this.logger.verbose('update message to chatwoot'); + const dataUpdated = { + source_id: sourceId, + }; + await client.messages.update({ + accountId, + conversationId, + data: dataUpdated, + messageId, + }); + } + } + public async receiveWebhook(instance: InstanceDto, body: any) { try { this.logger.verbose('receive webhook to chatwoot instance: ' + instance.instanceName); @@ -1052,6 +1085,9 @@ export class ChatwootService { } for (const message of body.conversation.messages) { + const messageId = message?.id; + const conversationId = message?.conversation_id; + const accountId = message?.account_id; this.logger.verbose('check if message is media'); if (message.attachments && message.attachments.length > 0) { this.logger.verbose('message is media'); @@ -1062,7 +1098,8 @@ export class ChatwootService { formatText = null; } - await this.sendAttachment(waInstance, chatId, attachment.data_url, formatText); + const mediaMessage = await this.sendAttachment(waInstance, chatId, attachment.data_url, formatText); + await this.updateMessage(instance, accountId, conversationId, messageId, mediaMessage?.key?.id); } } else { this.logger.verbose('message is text'); @@ -1080,17 +1117,7 @@ export class ChatwootService { }; const message = await waInstance?.textMessage(data); - const conversationId = body?.conversation?.id; - const messageId = body?.id; - const dataUpdated = { - source_id: message.key.id, - }; - await client.messages.update({ - accountId: this.provider.account_id, - conversationId, - data: dataUpdated, - messageId, - }); + await this.updateMessage(instance, accountId, conversationId, messageId, message?.key?.id); } } } @@ -1191,7 +1218,7 @@ export class ChatwootService { private getContextMessageContent(types: any) { this.logger.verbose('get message context content'); - const typeKey = Object.keys(types).find((key) => types[key] !== undefined); + const typeKey = Object.keys(types).find((key) => types[key] !== undefined && types[key] !== ''); const result = typeKey ? types[typeKey] : undefined; return result; @@ -1301,11 +1328,11 @@ export class ChatwootService { const types = this.getContextIdTypeMessage(msg); - const messageContent = this.getContextMessageContent(types); + const messageContext = this.getContextMessageContent(types); - this.logger.verbose('context conversation message: ' + messageContent); + this.logger.verbose('context conversation message: ' + messageContext); - return messageContent; + return messageContext; } public async eventWhatsapp(event: string, instance: InstanceDto, body: any) { diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index f6a86f04..d11946ee 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -1992,7 +1992,6 @@ export class WAStartupService { messageTimestamp: messageSent.messageTimestamp as number, owner: this.instance.name, source: getDevice(messageSent.key.id), - source_id: messageSent.key.id, }; this.logger.log(messageRaw); From 72dae22ef422dd36d2d81809d3ec23493e3519f2 Mon Sep 17 00:00:00 2001 From: raimartinsb Date: Mon, 11 Sep 2023 07:44:09 -0300 Subject: [PATCH 4/4] Configuration to update source_id only when desired --- src/config/env.config.ts | 12 +++++-- src/dev-env.yml | 6 +++- src/whatsapp/services/chatwoot.service.ts | 42 +++++++++++++---------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/config/env.config.ts b/src/config/env.config.ts index 9c63b893..15e70dd6 100644 --- a/src/config/env.config.ts +++ b/src/config/env.config.ts @@ -70,6 +70,10 @@ export type Websocket = { ENABLED: boolean; }; +export type Chatwoot = { + USE_REPLY_ID: boolean; +}; + export type EventsWebhook = { APPLICATION_STARTUP: boolean; QRCODE_UPDATED: boolean; @@ -134,6 +138,7 @@ export interface Env { QRCODE: QrCode; AUTHENTICATION: Auth; PRODUCTION?: Production; + CHATWOOT?: Chatwoot; } export type Key = keyof Env; @@ -224,9 +229,7 @@ export class ConfigService { COLOR: process.env?.LOG_COLOR === 'true', BAILEYS: (process.env?.LOG_BAILEYS as LogBaileys) || 'error', }, - DEL_INSTANCE: process.env?.DEL_INSTANCE === 'true' - ? 5 - : Number.parseInt(process.env.DEL_INSTANCE) || false, + DEL_INSTANCE: process.env?.DEL_INSTANCE === 'true' ? 5 : Number.parseInt(process.env.DEL_INSTANCE) || false, WEBHOOK: { GLOBAL: { URL: process.env?.WEBHOOK_GLOBAL_URL, @@ -278,6 +281,9 @@ export class ConfigService { SECRET: process.env.AUTHENTICATION_JWT_SECRET, }, }, + CHATWOOT: { + USE_REPLY_ID: process.env?.USE_REPLY_ID === 'true', + }, }; } } diff --git a/src/dev-env.yml b/src/dev-env.yml index 235ec1b7..9f24f5a1 100644 --- a/src/dev-env.yml +++ b/src/dev-env.yml @@ -145,4 +145,8 @@ AUTHENTICATION: # Set the secret key to encrypt and decrypt your token and its expiration time. JWT: EXPIRIN_IN: 0 # seconds - 3600s === 1h | zero (0) - never expires - SECRET: L=0YWt]b2w[WF>#>:&E` \ No newline at end of file + SECRET: L=0YWt]b2w[WF>#>:&E` + +# Configure to chatwoot +CHATWOOT: + USE_REPLY_ID: false \ No newline at end of file diff --git a/src/whatsapp/services/chatwoot.service.ts b/src/whatsapp/services/chatwoot.service.ts index 56a90f67..06534bcf 100644 --- a/src/whatsapp/services/chatwoot.service.ts +++ b/src/whatsapp/services/chatwoot.service.ts @@ -5,7 +5,7 @@ import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs'; import mimeTypes from 'mime-types'; import path from 'path'; -import { ConfigService } from '../../config/env.config'; +import { Chatwoot, ConfigService } from '../../config/env.config'; import { Logger } from '../../config/logger.config'; import { ROOT_DIR } from '../../config/path.config'; import { ChatwootDto } from '../dto/chatwoot.dto'; @@ -966,25 +966,29 @@ export class ChatwootService { messageId: number, sourceId: string | null, ) { - this.logger.verbose('update message to chatwoot instance: ' + instance.instanceName); - const client = await this.clientCw(instance); + // const useReplyId = this.configService.get('DEL_INSTANCE'); + const useReplyId = this.configService.get('CHATWOOT')?.USE_REPLY_ID; + if (useReplyId === true) { + this.logger.verbose('update message to chatwoot instance: ' + instance.instanceName); + const client = await this.clientCw(instance); - if (!client) { - this.logger.warn('client not found'); - return null; - } - this.logger.verbose('check if sourceId to update'); - if (sourceId) { - this.logger.verbose('update message to chatwoot'); - const dataUpdated = { - source_id: sourceId, - }; - await client.messages.update({ - accountId, - conversationId, - data: dataUpdated, - messageId, - }); + if (!client) { + this.logger.warn('client not found'); + return null; + } + this.logger.verbose('check if sourceId to update'); + if (sourceId) { + this.logger.verbose('update message to chatwoot'); + const dataUpdated = { + source_id: sourceId, + }; + await client.messages.update({ + accountId, + conversationId, + data: dataUpdated, + messageId, + }); + } } }