feat(env): enhance webhook configuration and SSL support

DavidsonGomes · DavidsonGomes · commit 9cedf31eeda7 · 2025-05-21T17:55:00.000-03:00
- Added new environment variables for SSL configuration, including `SSL_CONF_PRIVKEY` and `SSL_CONF_FULLCHAIN`, to support secure connections.
- Introduced additional webhook configuration options in the `.env.example` file, such as `WEBHOOK_REQUEST_TIMEOUT_MS`, `WEBHOOK_RETRY_MAX_ATTEMPTS`, and related retry settings to improve webhook resilience and error handling.
- Updated the `bootstrap` function in `main.ts` to handle SSL certificate loading failures gracefully, falling back to HTTP if necessary.
- Enhanced error handling and logging in the `BusinessStartupService` to ensure better traceability and robustness when processing messages.

This commit focuses on improving the security and reliability of webhook interactions while ensuring that the application can handle SSL configurations effectively.
diff --git a/.env.example b/.env.example
@@ -3,6 +3,9 @@ SERVER_PORT=8080
 # Server URL - Set your application url
 SERVER_URL=http://localhost:8080
 
+SSL_CONF_PRIVKEY=/path/to/cert.key
+SSL_CONF_FULLCHAIN=/path/to/cert.crt
+
 SENTRY_DSN=
 
 # Cors - * for all or set separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
@@ -176,6 +179,15 @@ WEBHOOK_EVENTS_TYPEBOT_CHANGE_STATUS=false
 WEBHOOK_EVENTS_ERRORS=false
 WEBHOOK_EVENTS_ERRORS_WEBHOOK=
 
+WEBHOOK_REQUEST_TIMEOUT_MS=60000
+WEBHOOK_RETRY_MAX_ATTEMPTS=10
+WEBHOOK_RETRY_INITIAL_DELAY_SECONDS=5
+WEBHOOK_RETRY_USE_EXPONENTIAL_BACKOFF=true
+WEBHOOK_RETRY_MAX_DELAY_SECONDS=300
+WEBHOOK_RETRY_JITTER_FACTOR=0.2
+# Comma separated list of HTTP status codes that should not trigger retries
+WEBHOOK_RETRY_NON_RETRYABLE_STATUS_CODES=400,401,403,404,422
+
 # Name that will be displayed on smartphone connection
 CONFIG_SESSION_PHONE_CLIENT=Evolution API
 # Browser Name = Chrome | Firefox | Edge | Opera | Safari
@@ -275,4 +287,4 @@ LANGUAGE=en
 # PROXY_PORT=80
 # PROXY_PROTOCOL=http
 # PROXY_USERNAME=
-# PROXY_PASSWORD=
+# PROXY_PASSWORD=
diff --git a/src/api/integrations/channel/meta/whatsapp.business.service.ts b/src/api/integrations/channel/meta/whatsapp.business.service.ts
@@ -192,17 +192,63 @@ export class BusinessStartupService extends ChannelStartupService {
   }
 
   private messageTextJson(received: any) {
-    let content: any;
+    // Verificar que received y received.messages existen
+    if (!received || !received.messages || received.messages.length === 0) {
+      this.logger.error('Error: received object or messages array is undefined or empty');
+      return null;
+    }
+
     const message = received.messages[0];
+    let content: any;
+
+    // Verificar si es un mensaje de tipo sticker, location u otro tipo que no tiene text
+    if (!message.text) {
+      // Si no hay texto, manejamos diferente según el tipo de mensaje
+      if (message.type === 'sticker') {
+        content = { stickerMessage: {} };
+      } else if (message.type === 'location') {
+        content = {
+          locationMessage: {
+            degreesLatitude: message.location?.latitude,
+            degreesLongitude: message.location?.longitude,
+            name: message.location?.name,
+            address: message.location?.address,
+          },
+        };
+      } else {
+        // Para otros tipos de mensajes sin texto, creamos un contenido genérico
+        this.logger.log(`Mensaje de tipo ${message.type} sin campo text`);
+        content = { [message.type + 'Message']: message[message.type] || {} };
+      }
+
+      // Añadir contexto si existe
+      if (message.context) {
+        content = { ...content, contextInfo: { stanzaId: message.context.id } };
+      }
+
+      return content;
+    }
+
+    // Si el mensaje tiene texto, procesamos normalmente
+    if (!received.metadata || !received.metadata.phone_number_id) {
+      this.logger.error('Error: metadata or phone_number_id is undefined');
+      return null;
+    }
+
     if (message.from === received.metadata.phone_number_id) {
       content = {
         extendedTextMessage: { text: message.text.body },
       };
-      message.context ? (content = { ...content, contextInfo: { stanzaId: message.context.id } }) : content;
+      if (message.context) {
+        content = { ...content, contextInfo: { stanzaId: message.context.id } };
+      }
     } else {
       content = { conversation: message.text.body };
-      message.context ? (content = { ...content, contextInfo: { stanzaId: message.context.id } }) : content;
+      if (message.context) {
+        content = { ...content, contextInfo: { stanzaId: message.context.id } };
+      }
     }
+
     return content;
   }
 
@@ -300,6 +346,9 @@ export class BusinessStartupService extends ChannelStartupService {
       case 'location':
         messageType = 'locationMessage';
         break;
+      case 'sticker':
+        messageType = 'stickerMessage';
+        break;
       default:
         messageType = 'conversation';
         break;
@@ -316,12 +365,28 @@ export class BusinessStartupService extends ChannelStartupService {
       if (received.contacts) pushName = received.contacts[0].profile.name;
 
       if (received.messages) {
+        const message = received.messages[0]; // Añadir esta línea para definir message
+
         const key = {
-          id: received.messages[0].id,
+          id: message.id,
           remoteJid: this.phoneNumber,
-          fromMe: received.messages[0].from === received.metadata.phone_number_id,
+          fromMe: message.from === received.metadata.phone_number_id,
         };
-        if (this.isMediaMessage(received?.messages[0])) {
+
+        if (message.type === 'sticker') {
+          this.logger.log('Procesando mensaje de tipo sticker');
+          messageRaw = {
+            key,
+            pushName,
+            message: {
+              stickerMessage: message.sticker || {},
+            },
+            messageType: 'stickerMessage',
+            messageTimestamp: parseInt(message.timestamp) as number,
+            source: 'unknown',
+            instanceId: this.instanceId,
+          };
+        } else if (this.isMediaMessage(message)) {
           messageRaw = {
             key,
             pushName,
@@ -455,17 +520,6 @@ export class BusinessStartupService extends ChannelStartupService {
             source: 'unknown',
             instanceId: this.instanceId,
           };
-        } else if (received?.messages[0].location) {
-          messageRaw = {
-            key,
-            pushName,
-            message: this.messageLocationJson(received),
-            contextInfo: this.messageLocationJson(received)?.contextInfo,
-            messageType: this.renderMessageType(received.messages[0].type),
-            messageTimestamp: parseInt(received.messages[0].timestamp) as number,
-            source: 'unknown',
-            instanceId: this.instanceId,
-          };
         } else {
           messageRaw = {
             key,
@@ -501,7 +555,7 @@ export class BusinessStartupService extends ChannelStartupService {
             openAiDefaultSettings.speechToText &&
             audioMessage
           ) {
-            messageRaw.message.speechToText = await this.openaiService.speechToText({
+            messageRaw.message.speechToText = await this.openaiService.speechToText(openAiDefaultSettings.OpenaiCreds, {
               message: {
                 mediaUrl: messageRaw.message.mediaUrl,
                 ...messageRaw,
@@ -535,7 +589,7 @@ export class BusinessStartupService extends ChannelStartupService {
           }
         }
 
-        if (!this.isMediaMessage(received?.messages[0])) {
+        if (!this.isMediaMessage(message) && message.type !== 'sticker') {
           await this.prismaRepository.message.create({
             data: messageRaw,
           });
@@ -738,10 +792,48 @@ export class BusinessStartupService extends ChannelStartupService {
   }
 
   protected async eventHandler(content: any) {
-    const database = this.configService.get<Database>('DATABASE');
-    const settings = await this.findSettings();
-
-    this.messageHandle(content, database, settings);
+    try {
+      // Registro para depuración
+      this.logger.log('Contenido recibido en eventHandler:');
+      this.logger.log(JSON.stringify(content, null, 2));
+
+      const database = this.configService.get<Database>('DATABASE');
+      const settings = await this.findSettings();
+
+      // Si hay mensajes, verificar primero el tipo
+      if (content.messages && content.messages.length > 0) {
+        const message = content.messages[0];
+        this.logger.log(`Tipo de mensaje recibido: ${message.type}`);
+
+        // Verificamos el tipo de mensaje antes de procesarlo
+        if (
+          message.type === 'text' ||
+          message.type === 'image' ||
+          message.type === 'video' ||
+          message.type === 'audio' ||
+          message.type === 'document' ||
+          message.type === 'sticker' ||
+          message.type === 'location' ||
+          message.type === 'contacts' ||
+          message.type === 'interactive' ||
+          message.type === 'button' ||
+          message.type === 'reaction'
+        ) {
+          // Procesar el mensaje normalmente
+          this.messageHandle(content, database, settings);
+        } else {
+          this.logger.warn(`Tipo de mensaje no reconocido: ${message.type}`);
+        }
+      } else if (content.statuses) {
+        // Procesar actualizaciones de estado
+        this.messageHandle(content, database, settings);
+      } else {
+        this.logger.warn('No se encontraron mensajes ni estados en el contenido recibido');
+      }
+    } catch (error) {
+      this.logger.error('Error en eventHandler:');
+      this.logger.error(error);
+    }
   }
 
   protected async sendMessageWithTyping(number: string, message: any, options?: Options, isIntegration = false) {
@@ -823,7 +915,6 @@ export class BusinessStartupService extends ChannelStartupService {
         }
         if (message['media']) {
           const isImage = message['mimetype']?.startsWith('image/');
-          const isVideo = message['mimetype']?.startsWith('video/');
 
           content = {
             messaging_product: 'whatsapp',
@@ -833,7 +924,7 @@ export class BusinessStartupService extends ChannelStartupService {
             [message['mediaType']]: {
               [message['type']]: message['id'],
               preview_url: Boolean(options?.linkPreview),
-              ...(message['fileName'] && !isImage && !isVideo && { filename: message['fileName'] }),
+              ...(message['fileName'] && !isImage && { filename: message['fileName'] }),
               caption: message['caption'],
             },
           };
@@ -1001,10 +1092,7 @@ export class BusinessStartupService extends ChannelStartupService {
 
   private async getIdMedia(mediaMessage: any) {
     const formData = new FormData();
-    const media = mediaMessage.media || mediaMessage.audio;
-    if (!media) throw new Error('Media or audio not found');
-
-    const fileStream = createReadStream(media);
+    const fileStream = createReadStream(mediaMessage.media);
 
     formData.append('file', fileStream, { filename: 'media', contentType: mediaMessage.mimetype });
     formData.append('typeFile', mediaMessage.mimetype);
@@ -1105,7 +1193,7 @@ export class BusinessStartupService extends ChannelStartupService {
     const prepareMedia: any = {
       fileName: `${hash}.mp3`,
       mediaType: 'audio',
-      audio,
+      media: audio,
     };
 
     if (isURL(audio)) {
@@ -1127,7 +1215,15 @@ export class BusinessStartupService extends ChannelStartupService {
   public async audioWhatsapp(data: SendAudioDto, file?: any, isIntegration = false) {
     const mediaData: SendAudioDto = { ...data };
 
-    if (file) mediaData.audio = file.buffer.toString('base64');
+    if (file?.buffer) {
+      mediaData.audio = file.buffer.toString('base64');
+    } else if (isURL(mediaData.audio)) {
+      // DO NOTHING
+      // mediaData.audio = mediaData.audio;
+    } else {
+      console.error('El archivo no tiene buffer o file es undefined');
+      throw new Error('File or buffer is undefined');
+    }
 
     const message = await this.processAudio(mediaData.audio, data.number);
 
diff --git a/src/api/integrations/chatbot/base-chatbot.service.ts b/src/api/integrations/chatbot/base-chatbot.service.ts
@@ -223,15 +223,15 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
   ): Promise<void> {
     if (!message) return;
 
-    const linkRegex = /(!?)\[(.*?)\]\((.*?)\)/g;
+    const linkRegex = /!?\[(.*?)\]\((.*?)\)/g;
     let textBuffer = '';
     let lastIndex = 0;
     let match: RegExpExecArray | null;
 
     const splitMessages = (settings as any)?.splitMessages ?? false;
 
     while ((match = linkRegex.exec(message)) !== null) {
-      const [, , altText, url] = match;
+      const [fullMatch, altText, url] = match;
       const mediaType = this.getMediaType(url);
       const beforeText = message.slice(lastIndex, match.index);
 
@@ -276,7 +276,7 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
         }
       } else {
         // It's a regular link, keep it in the text
-        textBuffer += `[${altText}](${url})`;
+        textBuffer += fullMatch;
       }
 
       lastIndex = linkRegex.lastIndex;
diff --git a/src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts b/src/api/integrations/chatbot/chatwoot/utils/chatwoot-import-helper.ts
@@ -180,10 +180,10 @@ class ChatwootImport {
       const formattedSourceIds = sourceIds.map((sourceId) => `WAID:${sourceId.replace('WAID:', '')}`); // Make sure the sourceId is always formatted as WAID:1234567890
       let query: string;
       if (conversationId) {
-       query = 'SELECT source_id FROM messages WHERE source_id = ANY($1)';
+        query = 'SELECT source_id FROM messages WHERE source_id = ANY($1)';
       }
 
-      if(!conversationId) {
+      if (!conversationId) {
         query = 'SELECT source_id FROM messages WHERE source_id = ANY($1) AND conversation_id = $2';
       }
 
@@ -508,9 +508,7 @@ class ChatwootImport {
       templateMessage: msg.message.templateMessage?.hydratedTemplate?.hydratedContentText,
     };
 
-    const typeKey = Object.keys(types).find(
-      (key) => types[key] !== undefined && types[key] !== null
-    );
+    const typeKey = Object.keys(types).find((key) => types[key] !== undefined && types[key] !== null);
     switch (typeKey) {
       case 'documentMessage': {
         const doc = msg.message.documentMessage;
@@ -526,10 +524,13 @@ class ChatwootImport {
         return `_<File: ${fileName}${caption}>_`;
       }
 
-      case 'templateMessage':
+      case 'templateMessage': {
         const template = msg.message.templateMessage?.hydratedTemplate;
-        return (template?.hydratedTitleText ? `*${template.hydratedTitleText}*\n` : '') +
-              (template?.hydratedContentText || '');
+        return (
+          (template?.hydratedTitleText ? `*${template.hydratedTitleText}*\n` : '') +
+          (template?.hydratedContentText || '')
+        );
+      }
 
       case 'imageMessage':
         return '_<Image Message>_';
diff --git a/src/api/integrations/chatbot/dify/dto/dify.dto.ts b/src/api/integrations/chatbot/dify/dto/dify.dto.ts
@@ -1,4 +1,4 @@
-import { $Enums, TriggerOperator, TriggerType } from '@prisma/client';
+import { $Enums } from '@prisma/client';
 
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
diff --git a/src/api/integrations/chatbot/evoai/dto/evoai.dto.ts b/src/api/integrations/chatbot/evoai/dto/evoai.dto.ts
@@ -1,5 +1,3 @@
-import { TriggerOperator, TriggerType } from '@prisma/client';
-
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class EvoaiDto extends BaseChatbotDto {
diff --git a/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts b/src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts
@@ -86,7 +86,14 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
         await instance.client.sendPresenceUpdate('paused', remoteJid);
       }
 
-      const message = response?.data?.message;
+      let message = response?.data?.message;
+
+      if (message && typeof message === 'string' && message.startsWith("'") && message.endsWith("'")) {
+        const innerContent = message.slice(1, -1);
+        if (!innerContent.includes("'")) {
+          message = innerContent;
+        }
+      }
 
       if (message) {
         // Use the base class method to send the message to WhatsApp
diff --git a/src/api/integrations/chatbot/openai/dto/openai.dto.ts b/src/api/integrations/chatbot/openai/dto/openai.dto.ts
@@ -1,5 +1,3 @@
-import { TriggerOperator, TriggerType } from '@prisma/client';
-
 import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
 
 export class OpenaiCredsDto {
diff --git a/src/api/integrations/event/webhook/webhook.controller.ts b/src/api/integrations/event/webhook/webhook.controller.ts
diff --git a/src/api/services/channel.service.ts b/src/api/services/channel.service.ts
diff --git a/src/config/env.config.ts b/src/config/env.config.ts
diff --git a/src/main.ts b/src/main.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { $Enums, TriggerOperator, TriggerType } from '@prisma/client';`
	`1`	`+import { $Enums } from '@prisma/client';`
`2`	`2`
`3`	`3`	`import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import { TriggerOperator, TriggerType } from '@prisma/client';`
`2`		`-`
`3`	`1`	`import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';`
`4`	`2`
`5`	`3`	`export class EvoaiDto extends BaseChatbotDto {`