feat: integrate stability improvements from upstream PRs

sosamilton · sosamilton · commit 8fbd7d15458e · 2026-02-16T22:07:55.000-03:00
Integrates 3 key stability improvements: • PR EvolutionAPI#2420: Prevent Evolution instances from getting stuck in 'close' state - Auto-connect Evolution instances on startup - Force 'open' state for webhook-based integrations - Update monitor service to handle Evolution integration • PR EvolutionAPI#2372: Enhance contact and chat handling with improved JID mapping - Fix remoteLid vs remoteJid mapping in messaging-history.set - Add debug logs for better troubleshooting - Prevent orphaned chats without proper contact association - Clean remoteLid before database storage • PR EvolutionAPI#2427: Improve audio upsert reliability and GHCR workflow - Prevent early returns that skip message upsert emission - Add guarded fallback for inbound audio messages - Add GitHub Actions workflow for GHCR image publishing These improvements enhance: - Connection stability for Evolution instances - Contact/chat mapping accuracy - Audio message reliability - CI/CD with GHCR support All changes are non-breaking and backward compatible.
diff --git a/.github/workflows/publish_ghcr_image.yml b/.github/workflows/publish_ghcr_image.yml
@@ -0,0 +1,66 @@
+name: Build and Publish GHCR image
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository_owner }}/evolution-api
+
+jobs:
+  build-and-push:
+    name: Build and Push GHCR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=tag
+            type=sha
+
+      - name: Build and push
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Image digest
+        run: echo ${{ steps.build-and-push.outputs.digest }}
diff --git a/src/api/controllers/instance.controller.ts b/src/api/controllers/instance.controller.ts
@@ -156,6 +156,10 @@ export class InstanceController {
           getQrcode = instance.qrCode;
         }
 
+        if (instanceData.integration === Integration.EVOLUTION) {
+          await instance.connectToWhatsapp();
+        }
+
         const result = {
           instance: {
             instanceName: instance.instanceName,
diff --git a/src/api/integrations/channel/evolution/evolution.channel.service.ts b/src/api/integrations/channel/evolution/evolution.channel.service.ts
@@ -115,6 +115,15 @@ export class EvolutionStartupService extends ChannelStartupService {
 
   public async connectToWhatsapp(data?: any): Promise<any> {
     if (!data) {
+      this.stateConnection = { state: 'open' };
+
+      if (this.instanceId) {
+        await this.prismaRepository.instance.update({
+          where: { id: this.instanceId },
+          data: { connectionStatus: 'open' },
+        });
+      }
+
       this.loadChatwoot();
       return;
     }
diff --git a/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts b/src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
@@ -553,6 +553,10 @@ export class BaileysStartupService extends ChannelStartupService {
     }
   }
 
+  private getUpsertEmittedCacheKey(messageId: string) {
+    return `upsert_emitted_${this.instanceId}_${messageId}`;
+  }
+
   private async defineAuthState() {
     const db = this.configService.get<Database>('DATABASE');
     const cache = this.configService.get<CacheConf>('CACHE');
@@ -939,6 +943,14 @@ export class BaileysStartupService extends ChannelStartupService {
       progress?: number;
       syncType?: proto.HistorySync.HistorySyncType;
     }) => {
+      //These logs are crucial; when something changes in Baileys/WhatsApp, we can more easily understand what changed!
+      this.logger.debug('Messages abaixo');
+      this.logger.debug(messages);
+      this.logger.debug('Chats abaixo');
+      this.logger.debug(chats);
+      this.logger.debug('Contatos abaixo');
+      this.logger.debug(contacts);
+
       try {
         if (syncType === proto.HistorySync.HistorySyncType.ON_DEMAND) {
           console.log('received on-demand history sync, messages=', messages);
@@ -967,14 +979,29 @@ export class BaileysStartupService extends ChannelStartupService {
         }
 
         const contactsMap = new Map();
+        const contactsMapLidJid = new Map();
 
         for (const contact of contacts) {
+          let jid = null;
+
+          if (contact?.id?.search('@lid') !== -1) {
+            if (contact.phoneNumber) {
+              jid = contact.phoneNumber;
+            }
+          }
+
+          if (!jid) {
+            jid = contact?.id;
+          }
+
           if (contact.id && (contact.notify || contact.name)) {
-            contactsMap.set(contact.id, { name: contact.name ?? contact.notify, jid: contact.id });
+            contactsMap.set(contact.id, { name: contact.name ?? contact.notify, jid });
           }
+
+          contactsMapLidJid.set(contact.id, { jid });
         }
 
-        const chatsRaw: { remoteJid: string; instanceId: string; name?: string }[] = [];
+        const chatsRaw: { remoteJid: string; remoteLid: string; instanceId: string; name?: string }[] = [];
         const chatsRepository = new Set(
           (await this.prismaRepository.chat.findMany({ where: { instanceId: this.instanceId } })).map(
             (chat) => chat.remoteJid,
@@ -986,13 +1013,31 @@ export class BaileysStartupService extends ChannelStartupService {
             continue;
           }
 
-          chatsRaw.push({ remoteJid: chat.id, instanceId: this.instanceId, name: chat.name });
+          let remoteJid = null;
+          let remoteLid = null;
+
+          if (chat.id.search('@lid') !== -1) {
+            remoteLid = chat.id;
+            if (contactsMapLidJid.has(chat.id)) {
+              remoteJid = contactsMapLidJid.get(chat.id).jid;
+            }
+          }
+
+          if (!remoteJid) {
+            remoteJid = chat.id;
+          }
+
+          chatsRaw.push({ remoteJid, remoteLid, instanceId: this.instanceId, name: chat.name });
         }
 
         this.sendDataWebhook(Events.CHATS_SET, chatsRaw);
 
         if (this.configService.get<Database>('DATABASE').SAVE_DATA.HISTORIC) {
-          await this.prismaRepository.chat.createMany({ data: chatsRaw, skipDuplicates: true });
+          const chatsToCreateMany = JSON.parse(JSON.stringify(chatsRaw)).map((chat) => {
+            delete chat.remoteLid;
+            return chat;
+          });
+          await this.prismaRepository.chat.createMany({ data: chatsToCreateMany, skipDuplicates: true });
         }
 
         const messagesRaw: any[] = [];
@@ -1389,50 +1434,49 @@ export class BaileysStartupService extends ChannelStartupService {
                 try {
                   if (isVideo && !this.configService.get<S3>('S3').SAVE_VIDEO) {
                     this.logger.warn('Video upload is disabled. Skipping video upload.');
-                    // Skip video upload by returning early from this block
-                    return;
-                  }
-
-                  const message: any = received;
-
-                  // Verificação adicional para garantir que há conteúdo de mídia real
-                  const hasRealMedia = this.hasValidMediaContent(message);
-
-                  if (!hasRealMedia) {
-                    this.logger.warn('Message detected as media but contains no valid media content');
                   } else {
-                    const media = await this.getBase64FromMediaMessage({ message }, true);
-
-                    if (!media) {
-                      this.logger.verbose('No valid media to upload (messageContextInfo only), skipping MinIO');
-                      return;
+                    const message: any = received;
+
+                    // Verificação adicional para garantir que há conteúdo de mídia real
+                    const hasRealMedia = this.hasValidMediaContent(message);
+
+                    if (!hasRealMedia) {
+                      this.logger.warn('Message detected as media but contains no valid media content');
+                    } else {
+                      const media = await this.getBase64FromMediaMessage({ message }, true);
+
+                      if (!media) {
+                        this.logger.verbose('No valid media to upload (messageContextInfo only), skipping MinIO');
+                      } else {
+                        const { buffer, mediaType, fileName, size } = media;
+                        const mimetype = mimeTypes.lookup(fileName).toString();
+                        const fullName = join(
+                          `${this.instance.id}`,
+                          received.key.remoteJid,
+                          mediaType,
+                          `${Date.now()}_${fileName}`,
+                        );
+                        await s3Service.uploadFile(fullName, buffer, size.fileLength?.low, {
+                          'Content-Type': mimetype,
+                        });
+
+                        await this.prismaRepository.media.create({
+                          data: {
+                            messageId: msg.id,
+                            instanceId: this.instanceId,
+                            type: mediaType,
+                            fileName: fullName,
+                            mimetype,
+                          },
+                        });
+
+                        const mediaUrl = await s3Service.getObjectUrl(fullName);
+
+                        messageRaw.message.mediaUrl = mediaUrl;
+
+                        await this.prismaRepository.message.update({ where: { id: msg.id }, data: messageRaw });
+                      }
                     }
-
-                    const { buffer, mediaType, fileName, size } = media;
-                    const mimetype = mimeTypes.lookup(fileName).toString();
-                    const fullName = join(
-                      `${this.instance.id}`,
-                      received.key.remoteJid,
-                      mediaType,
-                      `${Date.now()}_${fileName}`,
-                    );
-                    await s3Service.uploadFile(fullName, buffer, size.fileLength?.low, { 'Content-Type': mimetype });
-
-                    await this.prismaRepository.media.create({
-                      data: {
-                        messageId: msg.id,
-                        instanceId: this.instanceId,
-                        type: mediaType,
-                        fileName: fullName,
-                        mimetype,
-                      },
-                    });
-
-                    const mediaUrl = await s3Service.getObjectUrl(fullName);
-
-                    messageRaw.message.mediaUrl = mediaUrl;
-
-                    await this.prismaRepository.message.update({ where: { id: msg.id }, data: messageRaw });
                   }
                 } catch (error) {
                   this.logger.error(['Error on upload file to minio', error?.message, error?.stack]);
@@ -1478,9 +1522,11 @@ export class BaileysStartupService extends ChannelStartupService {
           if (messageRaw.key.remoteJid?.includes('@lid') && messageRaw.key.remoteJidAlt) {
             messageRaw.key.remoteJid = messageRaw.key.remoteJidAlt;
           }
-          console.log(messageRaw);
+          await this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
-          this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
+          if (messageRaw.messageType === 'audioMessage' && !messageRaw.key.fromMe && messageRaw.key.id) {
+            await this.baileysCache.set(this.getUpsertEmittedCacheKey(messageRaw.key.id), true, 60 * 10);
+          }
 
           await chatbotController.emit({
             instance: { instanceName: this.instance.name, instanceId: this.instanceId },
@@ -1649,6 +1695,37 @@ export class BaileysStartupService extends ChannelStartupService {
               this.logger.warn(`Original message not found for update. Skipping. Key: ${JSON.stringify(key)}`);
               continue;
             }
+
+            if (!key.fromMe && findMessage.messageType === 'audioMessage' && key.id) {
+              const upsertCacheKey = this.getUpsertEmittedCacheKey(key.id);
+              const alreadyEmitted = await this.baileysCache.get(upsertCacheKey);
+
+              if (!alreadyEmitted) {
+                const fallbackUpsertPayload = {
+                  key: findMessage.key,
+                  pushName: findMessage.pushName,
+                  status: findMessage.status,
+                  message: findMessage.message,
+                  contextInfo: findMessage.contextInfo,
+                  messageType: findMessage.messageType,
+                  messageTimestamp: findMessage.messageTimestamp,
+                  instanceId: findMessage.instanceId,
+                  source: findMessage.source,
+                };
+
+                try {
+                  await this.sendDataWebhook(Events.MESSAGES_UPSERT, fallbackUpsertPayload);
+                  await this.baileysCache.set(upsertCacheKey, true, 60 * 10);
+                  this.logger.warn(`Fallback messages.upsert emitted for audio message ${key.id}`);
+                } catch (error) {
+                  this.logger.error([
+                    `Failed to emit fallback messages.upsert for audio message ${key.id}`,
+                    error?.message,
+                  ]);
+                }
+              }
+            }
+
             message.messageId = findMessage.id;
           }
 
diff --git a/src/api/services/monitor.service.ts b/src/api/services/monitor.service.ts
@@ -293,7 +293,11 @@ export class WAMonitoringService {
       ownerJid: instanceData.ownerJid,
     });
 
-    if (instanceData.connectionStatus === 'open' || instanceData.connectionStatus === 'connecting') {
+    if (
+      instanceData.connectionStatus === 'open' ||
+      instanceData.connectionStatus === 'connecting' ||
+      instanceData.integration === Integration.EVOLUTION
+    ) {
       this.logger.info(
         `Auto-connecting instance "${instanceData.instanceName}" (status: ${instanceData.connectionStatus})`,
       );
