Merge branch 'EvolutionAPI:develop' into develop

neocol83 · web-flow · commit 6b81eb64d857 · 2025-10-15T09:50:56.000-05:00
diff --git a/.github/workflows/check_code_quality.yml b/.github/workflows/check_code_quality.yml
@@ -13,6 +13,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v5
+      with:
+        submodules: recursive
 
     - name: Install Node
       uses: actions/setup-node@v5
diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          submodules: recursive
 
       - name: Docker meta
         id: meta
diff --git a/.github/workflows/publish_docker_image_homolog.yml b/.github/workflows/publish_docker_image_homolog.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          submodules: recursive
 
       - name: Docker meta
         id: meta
diff --git a/.github/workflows/publish_docker_image_latest.yml b/.github/workflows/publish_docker_image_latest.yml
@@ -15,6 +15,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+        with:
+          submodules: recursive
 
       - name: Docker meta
         id: meta
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -26,6 +26,8 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v5
+      with:
+        submodules: recursive
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
@@ -47,5 +49,7 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v5
+        with:
+          submodules: recursive
       - name: Dependency Review
         uses: actions/dependency-review-action@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-# 2.3.5 (develop)
+# 2.3.5 (2025-10-15)
+
+### Features
+
+* **Chatwoot Enhancements**: Comprehensive improvements to message handling, editing, deletion and i18n
+* **Participants Data**: Add participantsData field maintaining backward compatibility for group participants
+* **LID to Phone Number**: Convert LID to phoneNumber on group participants
+* **Docker Configurations**: Add Kafka and frontend services to Docker configurations
 
 ### Fixed
 
@@ -7,9 +14,28 @@
   - Fixed `ERROR: relation "public.Instance" does not exist` issue in migration `20250918182355_add_kafka_integration`
   - Aligned table naming convention with other Evolution API migrations for consistency
   - Resolved database migration failure that prevented Kafka integration setup
-* **Update Baileys Version**: v7.0.0-rc.4
-* Refactor connection with PostgreSQL and improve message handling
+* **Update Baileys Version**: v7.0.0-rc.5 with compatibility fixes
+  - Fixed assertSessions signature compatibility using type assertion
+  - Fixed incompatibility in voice call (wavoip) with new Baileys version
+  - Handle undefined status in update by defaulting to 'DELETED'
+* **Chatwoot Improvements**: Multiple fixes for enhanced reliability
+  - Correct chatId extraction for non-group JIDs
+  - Resolve webhook timeout on deletion with 5+ images
+  - Improve error handling in Chatwoot messages
+  - Adjust conversation verification logic and cache
+  - Optimize conversation reopening logic and connection notification
+  - Fix conversation reopening and connection loop
+* **Baileys Message Handling**: Enhanced message processing
+  - Add warning log for messages not found
+  - Fix message verification in Baileys service
+  - Simplify linkPreview handling in BaileysStartupService
+* **Media Validation**: Fix media content validation
+* **PostgreSQL Connection**: Refactor connection with PostgreSQL and improve message handling
+
+### Code Quality & Refactoring
 
+* **Exponential Backoff**: Implement exponential backoff patterns and extract magic numbers to constants
+* **TypeScript Build**: Update TypeScript build process and dependencies
 
 ### 
 
diff --git a/evolution-manager-v2 b/evolution-manager-v2
@@ -1 +1 @@
-Subproject commit e510b5f17fc75cbddeaaba102ddd568e4b127455
+Subproject commit f054b9bc28083152d4948f835e3346fd0add39db
diff --git a/manager/dist/assets/images/evolution-logo.png b/manager/dist/assets/images/evolution-logo.png
diff --git a/manager/dist/assets/index-CO3NSIFj.js b/manager/dist/assets/index-CO3NSIFj.js
diff --git a/manager/dist/assets/index-DJ2Q5K8k.js b/manager/dist/assets/index-DJ2Q5K8k.js
diff --git a/manager/dist/assets/index-DsIrum0U.css b/manager/dist/assets/index-DsIrum0U.css
diff --git a/manager/dist/assets/index-DxAxQfZR.css b/manager/dist/assets/index-DxAxQfZR.css
diff --git a/manager/dist/index.html b/manager/dist/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/png" href="https://evolution-api.com/files/evo/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Evolution Manager</title>
-    <script type="module" crossorigin src="/assets/index-DJ2Q5K8k.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DxAxQfZR.css">
+    <script type="module" crossorigin src="/assets/index-CO3NSIFj.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DsIrum0U.css">
   </head>
   <body>
     <div id="root"></div>
diff --git a/manager_install.sh b/manager_install.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+cd evolution-manager-v2
+npm install
+npm run build
+cd ..
+rm -rf manager/dist
+cp -r evolution-manager-v2/dist manager/dist
diff --git a/package.json b/package.json
@@ -126,8 +126,6 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@swc/core": "^1.13.5",
-    "@swc/helpers": "^0.5.17",
     "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.18",
diff --git a/src/api/integrations/channel/evolution/evolution.channel.service.ts b/src/api/integrations/channel/evolution/evolution.channel.service.ts
@@ -16,6 +16,7 @@ import { Events, wa } from '@api/types/wa.types';
 import { AudioConverter, Chatwoot, ConfigService, Openai, S3 } from '@config/env.config';
 import { BadRequestException, InternalServerErrorException } from '@exceptions';
 import { createJid } from '@utils/createJid';
+import { sendTelemetry } from '@utils/sendTelemetry';
 import axios from 'axios';
 import { isBase64, isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
@@ -171,6 +172,8 @@ export class EvolutionStartupService extends ChannelStartupService {
 
         this.logger.log(messageRaw);
 
+        sendTelemetry(`received.message.${messageRaw.messageType ?? 'unknown'}`);
+
         this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
         await chatbotController.emit({
diff --git a/src/api/integrations/channel/meta/whatsapp.business.service.ts b/src/api/integrations/channel/meta/whatsapp.business.service.ts
@@ -24,6 +24,7 @@ import { AudioConverter, Chatwoot, ConfigService, Database, Openai, S3, WaBusine
 import { BadRequestException, InternalServerErrorException } from '@exceptions';
 import { createJid } from '@utils/createJid';
 import { status } from '@utils/renderStatus';
+import { sendTelemetry } from '@utils/sendTelemetry';
 import axios from 'axios';
 import { arrayUnique, isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
@@ -655,6 +656,8 @@ export class BusinessStartupService extends ChannelStartupService {
 
         this.logger.log(messageRaw);
 
+        sendTelemetry(`received.message.${messageRaw.messageType ?? 'unknown'}`);
+
         this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
         await chatbotController.emit({
diff --git a/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts b/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
@@ -85,6 +85,7 @@ import { fetchLatestWaWebVersion } from '@utils/fetchLatestWaWebVersion';
 import { makeProxyAgent } from '@utils/makeProxyAgent';
 import { getOnWhatsappCache, saveOnWhatsappCache } from '@utils/onWhatsappCache';
 import { status } from '@utils/renderStatus';
+import { sendTelemetry } from '@utils/sendTelemetry';
 import useMultiFileAuthStatePrisma from '@utils/use-multi-file-auth-state-prisma';
 import { AuthStateProvider } from '@utils/use-multi-file-auth-state-provider-files';
 import { useMultiFileAuthStateRedisDb } from '@utils/use-multi-file-auth-state-redis-db';
@@ -1350,6 +1351,8 @@ export class BaileysStartupService extends ChannelStartupService {
 
           this.logger.log(messageRaw);
 
+          sendTelemetry(`received.message.${messageRaw.messageType ?? 'unknown'}`);
+
           this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
           await chatbotController.emit({
@@ -1720,6 +1723,9 @@ export class BaileysStartupService extends ChannelStartupService {
           }
 
           if (settings?.msgCall?.trim().length > 0 && call.status == 'offer') {
+            if (call.from.endsWith('@lid')) {
+              call.from = await this.client.signalRepository.lidMapping.getPNForLID(call.from as string);
+            }
             const msg = await this.client.sendMessage(call.from, { text: settings.msgCall });
 
             this.client.ev.emit('messages.upsert', { messages: [msg], type: 'notify' });
diff --git a/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts b/src/api/integrations/chatbot/chatwoot/services/chatwoot.service.ts
@@ -678,7 +678,7 @@ export class ChatwootService {
         }
 
         const isGroup = remoteJid.includes('@g.us');
-        const chatId = isGroup ? remoteJid : remoteJid.split('@')[0];
+        const chatId = isGroup ? remoteJid : remoteJid.split('@')[0].split(':')[0];
         let nameContact = !body.key.fromMe ? body.pushName : chatId;
         const filterInbox = await this.getInbox(instance);
         if (!filterInbox) return null;
