Merge branch 'release/1.8.1'

Updated server.module.ts and monitor.service.ts to improve service initialization and monitoring logic. Modified main.ts to integrate changes. This enhances the application's performance and reliability.

.github/ISSUE_TEMPLATE/-en--bug-report.md

@@ -1,38 +0,0 @@
----
-name: "[EN] Bug report"
-about: Create a report to help us improve
-title: "[EN][BUG]"
-labels: bug
-assignees: ''
-
----
-
-### Title: [Brief Description of the Bug]
-
-#### Description:
-Describe in detail the problem you encountered. Include any relevant context that may help understand the origin of the bug.
-
-#### Steps to Reproduce:
-1. List the steps necessary to reproduce the problem.
-2. Try to be as specific as possible.
-3. If the problem occurs in a specific scenario, describe it here.
-
-#### Expected Behavior:
-Describe what you expected to happen when following the steps above.
-
-#### Current Behavior:
-Explain what actually happens when you follow the steps above.
-
-#### Screenshots/Videos:
-If possible, add screenshots or videos illustrating the problem. This can be extremely helpful in understanding the issue.
-
-#### Environment:
-- **Server:** [e.g., Ubuntu 18.04]
-- **API Version:** [e.g., 1.5.4]
-- **Other Hardware/Software Specifications:** [e.g., CPU, GPU]
-
-#### Submitting Logs:
-Please attach logs that may be related to the problem. If the logs contain sensitive information, consider sending them privately to one of the project maintainers.
-
-#### Additional Notes:
-Include here any other information that you think might be useful in understanding or resolving the bug.

.github/ISSUE_TEMPLATE/-en--bug-report.yaml

@@ -0,0 +1,107 @@
+name: Bug Report
+description: Create a report to help us improve.
+labels:
+  - bug
+  - en
+  # - help wanted
+# Automatically assign the issue to:
+# assignees: DavidsonGomes
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Welcome!
+      description: |
+        The issue tracker is only for reporting bugs and feature requests.
+        For user-related support questions, please visit:
+          - [Discord](https://evolution-api.com/discord)
+          - [WhatsApp Group](https://evolution-api.com/whatsapp)
+          <br/>
+
+        **DO NOT OPEN AN ISSUE FOR GENERAL SUPPORT QUESTIONS.**
+
+      options:
+        - label: Yes, I have searched for similar issues on [GitHub](https://github.com/EvolutionAPI/evolution-api/issues) and found none.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: What did you do?
+      description: |
+        How to write a good bug report?
+
+        - Respect the issue template as much as possible.
+        - The title should be short and descriptive.
+        - Explain the conditions that led you to report this issue: the context.
+        - The context should lead to something, an idea or problem you are facing.
+        - Be clear and concise.
+        - Format your messages to help the reader focus on what matters and understand the structure of your message, use [Markdown syntax](https://help.github.com/articles/github-flavored-markdown)
+      placeholder: Describe the problem you encountered in detail.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What did you expect?
+      placeholder: Describe what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What did you observe instead of what you expected?
+      placeholder: Explain what actually happens when you follow the steps above.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Screenshots/Videos
+      placeholder: |
+        If possible, add screenshots or videos that illustrate the problem. This can be extremely helpful in understanding the issue better.
+
+  - type: textarea
+    attributes:
+      label: Which version of the API are you using?
+      description: |
+        Enter the version number found in the `version` property of the **package.json**.
+      placeholder: Paste the version here.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: select
+    attributes:
+      label: What is your environment?
+      options:
+        - Windows
+        - Linux
+        - Mac
+        - Docker
+        - Other
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Other environment specifications
+      placeholder: 'Hardware/Software: [e.g., CPU, GPU]'
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: If applicable, paste the log output
+      description: |
+        Please attach any logs that might be related to the issue.
+        If the logs contain sensitive information, consider sending them privately to one of the project maintainers.
+      placeholder: Paste the application log here.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional Notes
+      description: Include any other information you think might be useful to understand or resolve the bug.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/-en--feature-request.md

@@ -1,28 +0,0 @@
----
-name: "[EN] Feature request"
-about: Suggest an idea for the API
-title: "[EN][FEAT]"
-labels: enhancement
-assignees: ''
-
----
-
-### Title: [Brief Description of Feature Request]
-
-#### Detailed Description:
-Clearly and in detail, describe the functionality you wish to be implemented. Explain how this fits into the context of the project.
-
-#### Rationale:
-Explain why this functionality would be useful for the project. This helps in understanding the importance and priority of the request.
-
-#### Usage Examples:
-Provide specific examples of how this feature could be used. This can include scenarios or use cases where the feature would be particularly beneficial.
-
-#### Possible Implementations:
-If you have ideas on how this feature might be implemented, please share them here. This is not mandatory but can be helpful for the development team.
-
-#### Impact on the Project:
-Discuss how this new feature could impact other parts of the project, if applicable.
-
-#### Additional Notes:
-Any other information you believe is relevant to your request.

.github/ISSUE_TEMPLATE/-en--feature-request.yaml

@@ -0,0 +1,86 @@
+name: Feature Request
+description: Suggest ideas for the project.
+labels:
+  - enhancement
+  - en
+# Automatically assign the issue to:
+# assignees: DavidsonGomes
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Welcome!
+      description: '**DO NOT OPEN FOR GENERAL SUPPORT QUESTIONS.**'
+
+      options:
+        - label: Yes, I have searched for similar requests on [GitHub](https://github.com/code-chat-br/whatsapp-api/issues) and found none.
+          required: true
+
+  - type: dropdown
+    attributes:
+      label: What type of feature?
+      description: |
+        How to write a good feature request?
+
+        - Respect the issue template as much as possible.
+        - The title should be short and descriptive.
+        - Explain the conditions that led you to suggest this feature: the context.
+        - The context should lead to something, an idea or problem you are facing.
+        - Be clear and concise.
+        - Format your messages to help the reader focus on what matters and understand the structure of your message, use [Markdown syntax](https://help.github.com/articles/github-flavored-markdown)
+      options:
+        - Integration
+        - Functionality
+        - Endpoint
+        - Database adjustment
+        - Other
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What is the motivation for the request?
+      description: |
+        What problem does the feature seek to solve?
+        Clearly and in detail describe the functionality you want to be implemented.
+        Explain how it fits into the context of the project.
+      placeholder: Detailed description
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Usage Examples
+      description: |
+        Provide specific examples of how this functionality could be used.
+        This can include scenarios or use cases where the feature would be particularly beneficial.
+      placeholder: text - image - video - flowcharts
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: How should the feature be developed?
+      description: |
+        Should it be inserted directly into the code?
+        Should it be built as a different application that acts as an extension of the API? 
+        For example: a `worker`?
+        
+        Discuss how this new functionality could impact other parts of the project, if applicable.
+
+        ---
+
+        If you have ideas on how this functionality could be implemented, please share them here.
+        This is not mandatory, but it can be helpful for the development team.
+
+      placeholder: Insert feature ideas here
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional Notes
+      description: Any other information you believe is relevant to your request.
+      placeholder: Insert your observations here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/-pt--reportar-bug.md

@@ -1,38 +0,0 @@
----
-name: "[PT] Reportar bug"
-about: Reportar um problema
-title: "[PT][BUG]"
-labels: bug
-assignees: ''
-
----
-
-### Título: [Breve Descrição do Bug]
-
-#### Descrição:
-Descreva detalhadamente o problema que você encontrou. Inclua qualquer contexto relevante que possa ajudar a entender a origem do bug.
-
-#### Passos para Reproduzir:
-1. Liste os passos necessários para reproduzir o problema.
-2. Tente ser o mais específico possível.
-3. Se o problema ocorrer em um cenário específico, descreva-o aqui.
-
-#### Comportamento Esperado:
-Descreva o que você esperava que acontecesse quando seguisse os passos acima.
-
-#### Comportamento Atual:
-Explique o que realmente acontece quando você segue os passos acima.
-
-#### Capturas de Tela/Vídeos:
-Se possível, adicione capturas de tela ou vídeos que ilustrem o problema. Isso pode ser extremamente útil para entender o problema.
-
-#### Ambiente:
-- **Servidor:** [ex: Ubuntu 18.04]
-- **Versão da API:** [ex: 1.5.4]
-- **Outras Especificações de Hardware/Software:** [ex: CPU, GPU]
-
-#### Envio de Logs:
-Por favor, anexe os logs que possam estar relacionados ao problema. Se os logs contiverem informações sensíveis, considere enviá-los de forma privada para um dos mantenedores do projeto.
-
-#### Notas Adicionais:
-Inclua aqui qualquer outra informação que você ache que possa ser útil para entender ou resolver o bug.

.github/ISSUE_TEMPLATE/-pt--reportar-bug.yaml

@@ -0,0 +1,108 @@
+name: Relatório de bug
+description: Crie um relatório para nos ajudar a melhorar.
+labels:
+  - bug
+  - pt-br
+  # - help wanted
+# Atrubuir automaticamente a issue a:
+# assignees: DavidsonGomes
+body:
+  - type: checkboxes
+    id: termos
+    attributes:
+      label: Bem-vido!
+      description: |
+        O rastreador de problemas é apenas para relatar bugs e solicitações de recursos.
+        Para perguntas de suporte relacionadas ao usuário final, acesse:
+          - [Discord](https://evolution-api.com/discord)
+          - [Grupo do WhatsApp](https://evolution-api.com/whatsapp)
+          <br/>
+
+        **NÃO ABRA UM PROBLEMA PARA PERGUNTAS GERAIS DE SUPORTE.**
+
+      options:
+        - label: Sim, pesquisei problemas semelhantes no [GitHub](https://github.com/EvolutionAPI/evolution-api/issues) e não encontrei nenhum.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: O que você fez?
+      description: |
+        Como escrever um bom relatório de bug?
+
+        - Respeite o modelo de problema tanto quanto possível.
+        - O título deve ser curto e descritivo.
+        - Explique as condições que o levaram a reportar este problema: o contexto.
+        - O contexto deve levar a algo, ideia ou problema que você está enfrentando.
+        - Seja claro e conciso.
+        - Formate suas mensagens para ajudar o leitor a se concentrar no que importa e entender a estrutura da sua mensagem, use [sintaxe Markdown](https://help.github.com/articles/github-flavored-markdown)
+      placeholder: Descreva detalhadamente o problema que você encontrou.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: O que você esperava?
+      placeholder: Descreva o que você esperava que acontecesse.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: O que vc observou ao invés do que esperava?
+      placeholder: Explique o que realmente acontece quando você segue os passos acima.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Capturas de Tela/Vídeos
+      placeholder: |
+        Se possível, adicione capturas de tela ou vídeos que ilustrem o problema. Isso pode ser extremamente útil para entender melhor o problema.
+
+  - type: textarea
+    attributes:
+      label: Qual versão da API você está usando?
+      description: |
+        Insira o número da sua versão que está na propriedade `version` do **package.json**.
+      placeholder: Cole aqui a versão.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: select
+    attributes:
+      label: Qual é o seu ambiente?
+      options:
+        - Windows
+        - Linux
+        - Mac
+        - Docker
+        - Outro
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Outras expecificações do ambiente
+      placeholder: 'Hardware/Software: [ex: CPU, GPU]'
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Se aplicável, cole a saída do log
+      description: |
+        Por favor, anexe os logs que possam estar relacionados ao problema.
+        Se os logs contiverem informações sensíveis, considere enviá-los de forma privada para um dos mantenedores do projeto.
+      placeholder: Cole aqui o log da aplicação
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Notas Adicionais
+      description: Inclua aqui qualquer outra informação que você ache que possa ser útil para entender ou resolver o bug.
+    validations:
+      required: false
+    

.github/ISSUE_TEMPLATE/-pt--solicitar-recurso.md

@@ -1,28 +0,0 @@
----
-name: "[PT] Solicitar recurso"
-about: Sugira novos recursos para a API
-title: "[PT][FEAT]"
-labels: enhancement
-assignees: ''
-
----
-
-### Título: [Breve Descrição da Solicitação de Recurso]
-
-#### Descrição Detalhada:
-Descreva claramente e em detalhes a funcionalidade que você deseja que seja implementada. Explique como isso se encaixa no contexto do projeto.
-
-#### Racional:
-Explique por que essa funcionalidade seria útil para o projeto. Isso ajuda a entender a importância e a prioridade da solicitação.
-
-#### Exemplos de Uso:
-Forneça exemplos específicos de como essa funcionalidade poderia ser utilizada. Isso pode incluir cenários ou casos de uso onde a funcionalidade seria particularmente benéfica.
-
-#### Possíveis Implementações:
-Se você tem ideias sobre como essa funcionalidade pode ser implementada, por favor, compartilhe-as aqui. Isso não é obrigatório, mas pode ser útil para a equipe de desenvolvimento.
-
-#### Impacto no Projeto:
-Discuta como essa nova funcionalidade poderia impactar outras partes do projeto, se aplicável.
-
-#### Notas Adicionais:
-Qualquer outra informação que você acredita ser relevante para a sua solicitação.

.github/ISSUE_TEMPLATE/-pt--solicitar-recurso.yaml

@@ -0,0 +1,86 @@
+name: Solicitação de recursos
+description: Sugira ideias para o projeto.
+labels:
+  - enhancement
+  - pt-br
+# Automatically assign the issue to:
+# assignees: DavidsonGomes
+body:
+  - type: checkboxes
+    id: termos
+    attributes:
+      label: Bem-vindo!
+      description: '**NÃO ABRA PARA PERGUNTAS GERAIS DE SUPORTE.**'
+
+      options:
+        - label: Sim, pesquisei solicitações semelhantes no [GitHub](https://github.com/code-chat-br/whatsapp-api/issues) e não encontrei nenhum.
+          required: true
+
+  - type: dropdown
+    attributes:
+      label: Qual tipo de recurso?
+      description: |
+        Como escrever uma boa solicitação de bug?
+
+        - Respeite o modelo de problema tanto quanto possível.
+        - O título deve ser curto e descritivo.
+        - Explique as condições que o levaram a reportar este problema: o contexto.
+        - O contexto deve levar a algo, ideia ou problema que você está enfrentando.
+        - Seja claro e conciso.
+        - Formate suas mensagens para ajudar o leitor a se concentrar no que importa e entender a estrutura da sua mensagem, use [sintaxe Markdown](https://help.github.com/articles/github-flavored-markdown)
+      options:
+        - Integração
+        - Funcionalidade
+        - Endpoint
+        - Ajuste de banco de dados
+        - Outro
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Qual a motivação para a solicitação?
+      description: |
+        Qual problema o recurso busca resolver?
+        Descreva claramente e em detalhes a funcionalidade que você deseja que seja implementada.
+        Explique como isso se encaixa no contexto do projeto.
+      placeholder: Descrição detalhada
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Exemplos de Uso
+      description: |
+        Forneça exemplos específicos de como essa funcionalidade poderia ser utilizada.
+        Isso pode incluir cenários ou casos de uso onde a funcionalidade seria particularmente benéfica.
+      placeholder: texto - imagem - video - fluxogramas
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Como o recurso deve ser desenvolvido?
+      description: |
+        Deve ser inserido diretamente no código?
+        Deve ser construído uma aplicação diferente que atuará como uma extenção da api? 
+        Por exemplo: um `worker`?
+        
+        Discuta como essa nova funcionalidade poderia impactar outras partes do projeto, se aplicável.
+
+        ---
+
+        Se você tem ideias sobre como essa funcionalidade pode ser implementada, por favor, compartilhe-as aqui.
+        Isso não é obrigatório, mas pode ser útil para a equipe de desenvolvimento.
+
+      placeholder: Insira ideias para o recurso
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Notas Adicionais
+      description: Qualquer outra informação que você acredita ser relevante para a sua solicitação.
+      placeholder: Insira aqui as sua observções.
+    validations:
+      required: false

.github/workflows/publish_docker_image.yml

@@ -2,63 +2,47 @@ name: Build Docker image
 
 on:
   push:
-    tags: ['v*']
+    tags:
+      - "*.*.*"
 
 jobs:
-  build-amd:
+  build_deploy:
+    name: Build and Deploy
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - name: Check out the repo
+      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Extract existing image metadata
+      - name: Docker meta
-        id: image-meta
+        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: atendai/evolution-api
+          tags: type=semver,pattern=v{{version}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      - name: Log in to Docker Hub
+      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Build and push AMD image
+      - name: Build and push
-        uses: docker/build-push-action@v4
+        id: docker_build
+        uses: docker/build-push-action@v5
         with:
-          context: .
+          platforms: linux/amd64,linux/arm64
-          labels: ${{ steps.image-meta.outputs.labels }}
-          platforms: linux/amd64
           push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
 
-  build-arm:
+      - name: Image digest
-    runs-on: buildjet-4vcpu-ubuntu-2204-arm
+        run: echo ${{ steps.docker_build.outputs.digest }}
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Extract existing image metadata
-        id: image-meta
-        uses: docker/metadata-action@v4
-        with:
-          images: atendai/evolution-api
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push ARM image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          labels: ${{ steps.image-meta.outputs.labels }}
-          platforms: linux/arm64
-          push: true

.github/workflows/publish_docker_image_homolog.yml

@@ -0,0 +1,48 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  build_deploy:
+    name: Build and Deploy
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: atendai/evolution-api
+          tags: homolog
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/publish_docker_image_v2.yml

@@ -0,0 +1,48 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - v2.0.0
+
+jobs:
+  build_deploy:
+    name: Build and Deploy
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: atendai/evolution-api
+          tags: v2.0.0-alpha
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

CHANGELOG.md

@@ -1,6 +1,42 @@
+# 1.8.1 (2024-06-08 21:32)
+
+### Feature
+
+* New method of saving sessions to a file using worker, made in partnership with [codechat](https://github.com/code-chat-br/whatsapp-api)
+
+### Fixed
+
+* Correction of variables breaking lines in typebot
+
+# 1.8.0 (2024-05-27 16:10)
+
+### Feature
+
+* Now in the manager, when logging in with the client's apikey, the listing only shows the instance corresponding to the provided apikey (only with MongoDB)
+* New global mode for rabbitmq events
+* Build in docker for linux/amd64, linux/arm64 platforms
+
+### Fixed
+
+* Correction in message formatting when generated by AI as markdown in typebot
+* Security fix in fetch instance with client key when not connected to mongodb
+
+# 1.7.5 (2024-05-21 08:50)
+
+### Fixed
+
+* Add merge_brazil_contacts function to solve nine digit in brazilian numbers
+* Optimize ChatwootService method for updating contact
+* Fix swagger auth
+* Update aws sdk v3
+* Fix getOpenConversationByContact and init queries error
+* Method to mark chat as unread
+* Added environment variable to manually select the WhatsApp web version for the baileys lib (optional)
+
 # 1.7.4 (2024-04-28 09:46)
 
 ### Fixed
+
 * Adjusts in proxy on fetchAgent
 * Recovering messages lost with redis cache
 * Log when init redis cache service
@@ -11,6 +47,7 @@
 # 1.7.3 (2024-04-18 12:07)
 
 ### Fixed
+
 * Revert fix audio encoding
 * Recovering messages lost with redis cache
 * Adjusts in redis for save instances

Docker/.env.example

@@ -33,10 +33,7 @@ CLEAN_STORE_CHATS=true
 
 # Permanent data storage
 DATABASE_ENABLED=false
-DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin &
+DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true
-readPreference=primary &
-ssl=false &
-directConnection=true
 DATABASE_CONNECTION_DB_PREFIX_NAME=evdocker
 
 # Choose the data you want to save in the application's database or store
@@ -47,9 +44,33 @@ DATABASE_SAVE_DATA_CONTACTS=false
 DATABASE_SAVE_DATA_CHATS=false
 
 RABBITMQ_ENABLED=false
-RABBITMQ_RABBITMQ_MODE=global
-RABBITMQ_EXCHANGE_NAME=evolution_exchange
 RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+RABBITMQ_EXCHANGE_NAME=evolution_exchange
+RABBITMQ_GLOBAL_ENABLED=false
+RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+RABBITMQ_EVENTS_QRCODE_UPDATED=true
+RABBITMQ_EVENTS_MESSAGES_SET=true
+RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+RABBITMQ_EVENTS_MESSAGES_DELETE=true
+RABBITMQ_EVENTS_SEND_MESSAGE=true
+RABBITMQ_EVENTS_CONTACTS_SET=true
+RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+RABBITMQ_EVENTS_CHATS_SET=true
+RABBITMQ_EVENTS_CHATS_UPSERT=true
+RABBITMQ_EVENTS_CHATS_UPDATE=true
+RABBITMQ_EVENTS_CHATS_DELETE=true
+RABBITMQ_EVENTS_GROUPS_UPSERT=true
+RABBITMQ_EVENTS_GROUPS_UPDATE=true
+RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+RABBITMQ_EVENTS_LABELS_EDIT=true
+RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+RABBITMQ_EVENTS_CALL=true
+RABBITMQ_EVENTS_TYPEBOT_START=false
+RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false
 
 WEBSOCKET_ENABLED=false
 WEBSOCKET_GLOBAL_EVENTS=false
@@ -113,7 +134,7 @@ CONFIG_SESSION_PHONE_NAME=Chrome
 
 # Set qrcode display limit
 QRCODE_LIMIT=30
-QRCODE_COLOR=#198754
+QRCODE_COLOR='#198754'
 
 # old | latest
 TYPEBOT_API_VERSION=latest
@@ -125,7 +146,7 @@ CHATWOOT_MESSAGE_DELETE=false # false | true
 # If you leave this option as true, when sending a message in Chatwoot, the client's last message will be marked as read on WhatsApp.
 CHATWOOT_MESSAGE_READ=false # false | true
 # This db connection is used to import messages from whatsapp to chatwoot database
-CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname
+CHATWOOT_IMPORT_DATABASE_CONNECTION_URI=postgres://user:password@hostname:port/dbname?sslmode=disable
 CHATWOOT_IMPORT_DATABASE_PLACEHOLDER_MEDIA_MESSAGE=true
 
 CACHE_REDIS_ENABLED=false

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20.7.0-alpine AS builder
 
-LABEL version="1.7.4" description="Api to control whatsapp features through http requests." 
+LABEL version="1.8.0" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="contato@agenciadgcode.com"
 
@@ -59,9 +59,35 @@ ENV DATABASE_SAVE_DATA_CONTACTS=false
 ENV DATABASE_SAVE_DATA_CHATS=false
 
 ENV RABBITMQ_ENABLED=false
-ENV RABBITMQ_MODE=global
-ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
 ENV RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
+ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
+ENV RABBITMQ_GLOBAL_ENABLED=false
+ENV RABBITMQ_EVENTS_APPLICATION_STARTUP=false
+ENV RABBITMQ_EVENTS_INSTANCE_CREATE=false
+ENV RABBITMQ_EVENTS_INSTANCE_DELETE=false
+ENV RABBITMQ_EVENTS_QRCODE_UPDATED=true
+ENV RABBITMQ_EVENTS_MESSAGES_SET=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPSERT=true
+ENV RABBITMQ_EVENTS_MESSAGES_UPDATE=true
+ENV RABBITMQ_EVENTS_MESSAGES_DELETE=true
+ENV RABBITMQ_EVENTS_SEND_MESSAGE=true
+ENV RABBITMQ_EVENTS_CONTACTS_SET=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPSERT=true
+ENV RABBITMQ_EVENTS_CONTACTS_UPDATE=true
+ENV RABBITMQ_EVENTS_PRESENCE_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_SET=true
+ENV RABBITMQ_EVENTS_CHATS_UPSERT=true
+ENV RABBITMQ_EVENTS_CHATS_UPDATE=true
+ENV RABBITMQ_EVENTS_CHATS_DELETE=true
+ENV RABBITMQ_EVENTS_GROUPS_UPSERT=true
+ENV RABBITMQ_EVENTS_GROUPS_UPDATE=true
+ENV RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+ENV RABBITMQ_EVENTS_CONNECTION_UPDATE=true
+ENV RABBITMQ_EVENTS_LABELS_EDIT=true
+ENV RABBITMQ_EVENTS_LABELS_ASSOCIATION=true
+ENV RABBITMQ_EVENTS_CALL=true
+ENV RABBITMQ_EVENTS_TYPEBOT_START=false
+ENV RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS=false
 
 ENV WEBSOCKET_ENABLED=false
 ENV WEBSOCKET_GLOBAL_EVENTS=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.7.4",
+  "version": "1.8.1",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -47,9 +47,9 @@
     "@hapi/boom": "^10.0.1",
     "@sentry/node": "^7.59.2",
     "amqplib": "^0.10.3",
-    "aws-sdk": "^2.1499.0",
+    "@aws-sdk/client-sqs": "^3.569.0",
     "axios": "^1.6.5",
-    "baileys": "^6.7.0",
+    "@whiskeysockets/baileys": "6.7.5",
     "class-validator": "^0.14.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",

src/api/controllers/chat.controller.ts

@@ -4,6 +4,7 @@ import {
   BlockUserDto,
   DeleteMessage,
   getBase64FromMediaMessageDto,
+  MarkChatUnreadDto,
   NumberDto,
   PrivacySettingDto,
   ProfileNameDto,
@@ -40,6 +41,11 @@ export class ChatController {
     return await this.waMonitor.waInstances[instanceName].archiveChat(data);
   }
 
+  public async markChatUnread({ instanceName }: InstanceDto, data: MarkChatUnreadDto) {
+    logger.verbose('requested markChatUnread from ' + instanceName + ' instance');
+    return await this.waMonitor.waInstances[instanceName].markChatUnread(data);
+  }
+
   public async deleteMessage({ instanceName }: InstanceDto, data: DeleteMessage) {
     logger.verbose('requested deleteMessage from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].deleteMessage(data);

src/api/controllers/instance.controller.ts

@@ -1,17 +1,18 @@
-import { delay } from 'baileys';
+import { delay } from '@whiskeysockets/baileys';
 import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
 import { v4 } from 'uuid';
 
-import { ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
+import { Auth, ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
-import { BadRequestException, InternalServerErrorException } from '../../exceptions';
+import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
 import { ChatwootService } from '../integrations/chatwoot/services/chatwoot.service';
 import { RabbitmqService } from '../integrations/rabbitmq/services/rabbitmq.service';
 import { SqsService } from '../integrations/sqs/services/sqs.service';
 import { TypebotService } from '../integrations/typebot/services/typebot.service';
 import { WebsocketService } from '../integrations/websocket/services/websocket.service';
+import { ProviderFiles } from '../provider/sessions';
 import { RepositoryBroker } from '../repository/repository.manager';
 import { AuthService, OldToken } from '../services/auth.service';
 import { CacheService } from '../services/cache.service';
@@ -42,7 +43,8 @@ export class InstanceController {
     private readonly proxyService: ProxyController,
     private readonly cache: CacheService,
     private readonly chatwootCache: CacheService,
-    private readonly messagesLostCache: CacheService,
+    private readonly baileysCache: CacheService,
+    private readonly providerFiles: ProviderFiles,
   ) {}
 
   private readonly logger = new Logger(InstanceController.name);
@@ -66,6 +68,7 @@ export class InstanceController {
     chatwoot_conversation_pending,
     chatwoot_import_contacts,
     chatwoot_name_inbox,
+    chatwoot_merge_brazil_contacts,
     chatwoot_import_messages,
     chatwoot_days_limit_import_messages,
     reject_call,
@@ -109,7 +112,8 @@ export class InstanceController {
           this.repository,
           this.cache,
           this.chatwootCache,
-          this.messagesLostCache,
+          this.baileysCache,
+          this.providerFiles,
         );
       } else {
         instance = new BaileysStartupService(
@@ -118,7 +122,8 @@ export class InstanceController {
           this.repository,
           this.cache,
           this.chatwootCache,
-          this.messagesLostCache,
+          this.baileysCache,
+          this.providerFiles,
         );
       }
 
@@ -519,6 +524,7 @@ export class InstanceController {
           reopen_conversation: chatwoot_reopen_conversation || false,
           conversation_pending: chatwoot_conversation_pending || false,
           import_contacts: chatwoot_import_contacts ?? true,
+          merge_brazil_contacts: chatwoot_merge_brazil_contacts ?? false,
           import_messages: chatwoot_import_messages ?? true,
           days_limit_import_messages: chatwoot_days_limit_import_messages ?? 60,
           auto_create: true,
@@ -574,6 +580,7 @@ export class InstanceController {
           sign_msg: chatwoot_sign_msg || false,
           reopen_conversation: chatwoot_reopen_conversation || false,
           conversation_pending: chatwoot_conversation_pending || false,
+          merge_brazil_contacts: chatwoot_merge_brazil_contacts ?? false,
           import_contacts: chatwoot_import_contacts ?? true,
           import_messages: chatwoot_import_messages ?? true,
           days_limit_import_messages: chatwoot_days_limit_import_messages || 60,
@@ -676,11 +683,26 @@ export class InstanceController {
     };
   }
 
-  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto) {
+  public async fetchInstances({ instanceName, instanceId, number }: InstanceDto, key: string) {
-    if (instanceName) {
+    const env = this.configService.get<Auth>('AUTHENTICATION').API_KEY;
-      this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
+
-      this.logger.verbose('instanceName: ' + instanceName);
+    let name = instanceName;
-      return this.waMonitor.instanceInfo(instanceName);
+    let arrayReturn = false;
+
+    if (env.KEY !== key) {
+      const instanceByKey = await this.repository.auth.findByKey(key);
+      if (instanceByKey) {
+        name = instanceByKey._id;
+        arrayReturn = true;
+      } else {
+        throw new UnauthorizedException();
+      }
+    }
+
+    if (name) {
+      this.logger.verbose('requested fetchInstances from ' + name + ' instance');
+      this.logger.verbose('instanceName: ' + name);
+      return this.waMonitor.instanceInfo(name, arrayReturn);
     } else if (instanceId || number) {
       return this.waMonitor.instanceInfoById(instanceId, number);
     }
@@ -731,7 +753,7 @@ export class InstanceController {
       this.logger.verbose('deleting instance: ' + instanceName);
 
       try {
-        this.waMonitor.waInstances[instanceName].sendDataWebhook(Events.INSTANCE_DELETE, {
+        this.waMonitor.waInstances[instanceName]?.sendDataWebhook(Events.INSTANCE_DELETE, {
           instanceName,
           instanceId: (await this.repository.auth.find(instanceName))?.instanceId,
         });

src/api/dto/chat.dto.ts

@@ -1,4 +1,4 @@
-import { proto, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from 'baileys';
+import { proto, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '@whiskeysockets/baileys';
 
 export class OnWhatsAppDto {
   constructor(
@@ -73,6 +73,11 @@ export class ArchiveChatDto {
   archive: boolean;
 }
 
+export class MarkChatUnreadDto {
+  lastMessage?: LastMessage;
+  chat?: string;
+}
+
 class PrivacySetting {
   readreceipts: WAReadReceiptsValue;
   profile: WAPrivacyValue;

src/api/dto/instance.dto.ts

@@ -1,4 +1,4 @@
-import { WAPresence } from 'baileys';
+import { WAPresence } from '@whiskeysockets/baileys';
 
 import { ProxyDto } from './proxy.dto';
 
@@ -27,6 +27,7 @@ export class InstanceDto {
   chatwoot_sign_msg?: boolean;
   chatwoot_reopen_conversation?: boolean;
   chatwoot_conversation_pending?: boolean;
+  chatwoot_merge_brazil_contacts?: boolean;
   chatwoot_import_contacts?: boolean;
   chatwoot_import_messages?: boolean;
   chatwoot_days_limit_import_messages?: number;

src/api/dto/sendMessage.dto.ts

@@ -1,4 +1,4 @@
-import { proto, WAPresence } from 'baileys';
+import { proto, WAPresence } from '@whiskeysockets/baileys';
 
 export class Quoted {
   key: proto.IMessageKey;

src/api/guards/auth.guard.ts

@@ -3,7 +3,7 @@ import { NextFunction, Request, Response } from 'express';
 import jwt from 'jsonwebtoken';
 
 import { name } from '../../../package.json';
-import { Auth, configService } from '../../config/env.config';
+import { Auth, configService, Database } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
 import { ForbiddenException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
@@ -58,6 +58,11 @@ async function jwtGuard(req: Request, res: Response, next: NextFunction) {
 async function apikey(req: Request, _: Response, next: NextFunction) {
   const env = configService.get<Auth>('AUTHENTICATION').API_KEY;
   const key = req.get('apikey');
+  const db = configService.get<Database>('DATABASE');
+
+  if (!key) {
+    throw new UnauthorizedException();
+  }
 
   if (env.KEY === key) {
     return next();
@@ -66,13 +71,22 @@ async function apikey(req: Request, _: Response, next: NextFunction) {
   if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
     throw new ForbiddenException('Missing global api key', 'The global api key must be set');
   }
+  const param = req.params as unknown as InstanceDto;
 
   try {
-    const param = req.params as unknown as InstanceDto;
+    if (param?.instanceName) {
       const instanceKey = await repository.auth.find(param.instanceName);
-    if (instanceKey.apikey === key) {
+      if (instanceKey?.apikey === key) {
         return next();
       }
+    } else {
+      if (req.originalUrl.includes('/instance/fetchInstances') && db.ENABLED) {
+        const instanceByKey = await repository.auth.findByKey(key);
+        if (instanceByKey) {
+          return next();
+        }
+      }
+    }
   } catch (error) {
     logger.error(error);
   }

src/api/integrations/chatwoot/controllers/chatwoot.controller.ts

@@ -53,6 +53,7 @@ export class ChatwootController {
       data.conversation_pending = false;
       data.import_contacts = false;
       data.import_messages = false;
+      data.merge_brazil_contacts = false;
       data.days_limit_import_messages = 0;
       data.auto_create = false;
       data.name_inbox = '';

src/api/integrations/chatwoot/dto/chatwoot.dto.ts

@@ -9,6 +9,7 @@ export class ChatwootDto {
   number?: string;
   reopen_conversation?: boolean;
   conversation_pending?: boolean;
+  merge_brazil_contacts?: boolean;
   import_contacts?: boolean;
   import_messages?: boolean;
   days_limit_import_messages?: number;

src/api/integrations/chatwoot/models/chatwoot.model.ts

@@ -14,6 +14,7 @@ export class ChatwootRaw {
   number?: string;
   reopen_conversation?: boolean;
   conversation_pending?: boolean;
+  merge_brazil_contacts?: boolean;
   import_contacts?: boolean;
   import_messages?: boolean;
   days_limit_import_messages?: number;
@@ -31,6 +32,7 @@ const chatwootSchema = new Schema<ChatwootRaw>({
   number: { type: String, required: true },
   reopen_conversation: { type: Boolean, required: true },
   conversation_pending: { type: Boolean, required: true },
+  merge_brazil_contacts: { type: Boolean, required: true },
   import_contacts: { type: Boolean, required: true },
   import_messages: { type: Boolean, required: true },
   days_limit_import_messages: { type: Number, required: true },

src/api/integrations/chatwoot/services/chatwoot.service.ts

@@ -8,8 +8,8 @@ import ChatwootClient, {
   inbox,
 } from '@figuro/chatwoot-sdk';
 import { request as chatwootRequest } from '@figuro/chatwoot-sdk/dist/core/request';
+import { proto } from '@whiskeysockets/baileys';
 import axios from 'axios';
-import { proto } from 'baileys';
 import FormData from 'form-data';
 import { createReadStream, unlinkSync, writeFileSync } from 'fs';
 import Jimp from 'jimp';
@@ -86,13 +86,14 @@ export class ChatwootService {
     return client;
   }
 
-  public getClientCwConfig(): ChatwootAPIConfig & { name_inbox: string } {
+  public getClientCwConfig(): ChatwootAPIConfig & { name_inbox: string; merge_brazil_contacts: boolean } {
     return {
       basePath: this.provider.url,
       with_credentials: true,
       credentials: 'include',
       token: this.provider.token,
       name_inbox: this.provider.name_inbox,
+      merge_brazil_contacts: this.provider.merge_brazil_contacts,
     };
   }
 
@@ -418,10 +419,49 @@ export class ChatwootService {
     }
   }
 
+  private async mergeBrazilianContacts(contacts: any[]) {
+    try {
+      //sdk chatwoot não tem função merge
+      this.logger.verbose('merging contacts');
+      const contact = await chatwootRequest(this.getClientCwConfig(), {
+        method: 'POST',
+        url: `/api/v1/accounts/${this.provider.account_id}/actions/contact_merge`,
+        body: {
+          base_contact_id: contacts.find((contact) => contact.phone_number.length === 14)?.id,
+          mergee_contact_id: contacts.find((contact) => contact.phone_number.length === 13)?.id,
+        },
+      });
+
+      return contact;
+    } catch {
+      this.logger.error('Error merging contacts');
+      return null;
+    }
+  }
+
   private findContactInContactList(contacts: any[], query: string) {
     const phoneNumbers = this.getNumbers(query);
     const searchableFields = this.getSearchableFields();
 
+    // eslint-disable-next-line prettier/prettier
+    if(contacts.length === 2 && this.getClientCwConfig().merge_brazil_contacts && query.startsWith('+55')){
+
+      const contact = this.mergeBrazilianContacts(contacts);
+      if (contact) {
+        return contact;
+      }
+    }
+
+    const phone = phoneNumbers.reduce(
+      (savedNumber, number) => (number.length > savedNumber.length ? number : savedNumber),
+      '',
+    );
+
+    const contact_with9 = contacts.find((contact) => contact.phone_number === phone);
+    if (contact_with9) {
+      return contact_with9;
+    }
+
     for (const contact of contacts) {
       for (const field of searchableFields) {
         if (contact[field] && phoneNumbers.includes(contact[field])) {
@@ -449,7 +489,7 @@ export class ChatwootService {
   }
 
   private getSearchableFields() {
-    return ['phone_number', 'identifier'];
+    return ['phone_number'];
   }
 
   private getFilterPayload(query: string) {
@@ -463,7 +503,7 @@ export class ChatwootService {
         const queryOperator = fieldsToSearch.length - 1 === index1 && numbers.length - 1 === index2 ? null : 'OR';
         filterPayload.push({
           attribute_key: field,
-          filter_operator: ['phone_number', 'identifier'].includes(field) ? 'equal_to' : 'contains',
+          filter_operator: 'equal_to',
           values: [number.replace('+', '')],
           query_operator: queryOperator,
         });
@@ -561,40 +601,32 @@ export class ChatwootService {
 
       const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId);
 
-      const findContact = await this.findContact(instance, chatId);
+      let contact = await this.findContact(instance, chatId);
 
-      let contact: any;
+      if (contact) {
-      if (body.key.fromMe) {
+        if (!body.key.fromMe) {
-        if (findContact) {
+          const waProfilePictureFile =
-          contact = await this.updateContact(instance, findContact.id, {
+            picture_url?.profilePictureUrl?.split('#')[0].split('?')[0].split('/').pop() || '';
-            avatar_url: picture_url.profilePictureUrl || null,
+          const chatwootProfilePictureFile = contact?.thumbnail?.split('#')[0].split('?')[0].split('/').pop() || '';
-          });
+          const pictureNeedsUpdate = waProfilePictureFile !== chatwootProfilePictureFile;
-        } else {
+          const nameNeedsUpdate =
-          const jid = isGroup ? null : body.key.remoteJid;
+            !contact.name ||
-          contact = await this.createContact(
+            contact.name === chatId ||
-            instance,
+            (`+${chatId}`.startsWith('+55')
-            chatId,
+              ? this.getNumbers(`+${chatId}`).some(
-            filterInbox.id,
+                  (v) => contact.name === v || contact.name === v.substring(3) || contact.name === v.substring(1),
-            isGroup,
+                )
-            nameContact,
+              : false);
-            picture_url.profilePictureUrl || null,
+
-            jid,
+          const contactNeedsUpdate = pictureNeedsUpdate || nameNeedsUpdate;
-          );
+          if (contactNeedsUpdate) {
-        }
+            this.logger.verbose('update contact in chatwoot');
-      } else {
+            contact = await this.updateContact(instance, contact.id, {
-        if (findContact) {
+              ...(nameNeedsUpdate && { name: nameContact }),
-          if (!findContact.name || findContact.name === chatId) {
+              ...(waProfilePictureFile === '' && { avatar: null }),
-            contact = await this.updateContact(instance, findContact.id, {
+              ...(pictureNeedsUpdate && { avatar_url: picture_url?.profilePictureUrl }),
-              name: nameContact,
-              avatar_url: picture_url.profilePictureUrl || null,
-            });
-          } else {
-            contact = await this.updateContact(instance, findContact.id, {
-              avatar_url: picture_url.profilePictureUrl || null,
             });
           }
-          if (!contact) {
-            contact = await this.findContact(instance, chatId);
         }
       } else {
         const jid = isGroup ? null : body.key.remoteJid;
@@ -608,7 +640,6 @@ export class ChatwootService {
           jid,
         );
       }
-      }
 
       if (!contact) {
         this.logger.warn('contact not found');
@@ -617,13 +648,6 @@ export class ChatwootService {
 
       const contactId = contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
 
-      if (!body.key.fromMe && contact.name === chatId && nameContact !== chatId) {
-        this.logger.verbose('update contact name in chatwoot');
-        await this.updateContact(instance, contactId, {
-          name: nameContact,
-        });
-      }
-
       this.logger.verbose('get contact conversations in chatwoot');
       const contactConversations = (await client.contacts.listConversations({
         accountId: this.provider.account_id,
@@ -789,26 +813,15 @@ export class ChatwootService {
       return null;
     }
 
-    const payload = [
+    const conversations = (await client.contacts.listConversations({
-      ['inbox_id', inbox.id.toString()],
+      accountId: this.provider.account_id,
-      ['contact_id', contact.id.toString()],
+      id: contact.id,
-      ['status', 'open'],
+    })) as any;
-    ];
 
     return (
-      (
+      conversations.payload.find(
-        (await client.conversations.filter({
+        (conversation) => conversation.inbox_id === inbox.id && conversation.status === 'open',
-          accountId: this.provider.account_id,
+      ) || undefined
-          payload: payload.map((item, i, payload) => {
-            return {
-              attribute_key: item[0],
-              filter_operator: 'equal_to',
-              values: [item[1]],
-              query_operator: i < payload.length - 1 ? 'AND' : null,
-            };
-          }),
-        })) as { payload: conversation[] }
-      ).payload[0] || undefined
     );
   }
 
@@ -1079,6 +1092,10 @@ export class ChatwootService {
         return messageSent;
       }
 
+      if (type === 'image' && parsedMedia && parsedMedia?.ext === '.gif') {
+        type = 'document';
+      }
+
       this.logger.verbose('send media to instance: ' + waInstance.instanceName);
       const data: SendMediaDto = {
         number: number,

src/api/integrations/chatwoot/utils/chatwoot-import-helper.ts

@@ -1,5 +1,5 @@
 import { inbox } from '@figuro/chatwoot-sdk';
-import { proto } from 'baileys';
+import { proto } from '@whiskeysockets/baileys';
 
 import { InstanceDto } from '../../../../api/dto/instance.dto';
 import { ChatwootRaw, ContactRaw, MessageRaw } from '../../../../api/models';

src/api/integrations/chatwoot/validate/chatwoot.schema.ts

@@ -35,6 +35,7 @@ export const chatwootSchema: JSONSchema7 = {
     conversation_pending: { type: 'boolean', enum: [true, false] },
     auto_create: { type: 'boolean', enum: [true, false] },
     import_contacts: { type: 'boolean', enum: [true, false] },
+    merge_brazil_contacts: { type: 'boolean', enum: [true, false] },
     import_messages: { type: 'boolean', enum: [true, false] },
     days_limit_import_messages: { type: 'number' },
   },

src/api/integrations/rabbitmq/libs/amqp.server.ts

@@ -42,6 +42,41 @@ export const getAMQP = (): amqp.Channel | null => {
   return amqpChannel;
 };
 
+export const initGlobalQueues = () => {
+  logger.info('Initializing global queues');
+  const events = configService.get<Rabbitmq>('RABBITMQ').EVENTS;
+
+  if (!events) {
+    logger.warn('No events to initialize on AMQP');
+    return;
+  }
+
+  const eventKeys = Object.keys(events);
+
+  eventKeys.forEach((event) => {
+    if (events[event] === false) return;
+
+    const queueName = `${event.replace(/_/g, '.').toLowerCase()}`;
+    const amqp = getAMQP();
+    const exchangeName = 'evolution_exchange';
+
+    amqp.assertExchange(exchangeName, 'topic', {
+      durable: true,
+      autoDelete: false,
+    });
+
+    amqp.assertQueue(queueName, {
+      durable: true,
+      autoDelete: false,
+      arguments: {
+        'x-queue-type': 'quorum',
+      },
+    });
+
+    amqp.bindQueue(queueName, exchangeName, event);
+  });
+};
+
 export const initQueues = (instanceName: string, events: string[]) => {
   if (!events || !events.length) return;
 

src/api/integrations/sqs/libs/sqs.server.ts

@@ -1,4 +1,4 @@
-import { SQS } from 'aws-sdk';
+import { SQS } from '@aws-sdk/client-sqs';
 
 import { configService, Sqs } from '../../../../config/env.config';
 import { Logger } from '../../../../config/logger.config';
@@ -12,8 +12,11 @@ export const initSQS = () => {
   return new Promise<void>((resolve, reject) => {
     const awsConfig = configService.get<Sqs>('SQS');
     sqs = new SQS({
+      credentials: {
         accessKeyId: awsConfig.ACCESS_KEY_ID,
         secretAccessKey: awsConfig.SECRET_ACCESS_KEY,
+      },
+
       region: awsConfig.REGION,
     });
 

src/api/integrations/typebot/services/typebot.service.ts

@@ -519,18 +519,36 @@ export class TypebotService {
         text += element.text;
       }
 
-      if (
+      if (element.children && element.type !== 'a') {
-        element.children &&
-        (element.type === 'p' ||
-          element.type === 'a' ||
-          element.type === 'inline-variable' ||
-          element.type === 'variable')
-      ) {
         for (const child of element.children) {
           text += applyFormatting(child);
         }
       }
 
+      if (element.type === 'p' && element.type !== 'inline-variable') {
+        text = text.trim() + '\n';
+      }
+
+      if (element.type === 'inline-variable') {
+        text = text.trim();
+      }
+
+      if (element.type === 'ol') {
+        text =
+          '\n' +
+          text
+            .split('\n')
+            .map((line, index) => (line ? `${index + 1}. ${line}` : ''))
+            .join('\n');
+      }
+
+      if (element.type === 'li') {
+        text = text
+          .split('\n')
+          .map((line) => (line ? `  ${line}` : ''))
+          .join('\n');
+      }
+
       let formats = '';
 
       if (element.bold) {
@@ -568,6 +586,8 @@ export class TypebotService {
 
           formattedText = formattedText.replace(/\*\*/g, '').replace(/__/, '').replace(/~~/, '').replace(/\n$/, '');
 
+          formattedText = formattedText.replace(/\n$/, '');
+
           await instance.textMessage({
             number: remoteJid.split('@')[0],
             options: {

src/api/models/integration.model.ts

@@ -9,12 +9,12 @@ export class IntegrationRaw {
   token?: string;
 }
 
-const sqsSchema = new Schema<IntegrationRaw>({
+const integrationSchema = new Schema<IntegrationRaw>({
   _id: { type: String, _id: true },
   integration: { type: String, required: true },
   number: { type: String, required: true },
   token: { type: String, required: true },
 });
 
-export const IntegrationModel = dbserver?.model(IntegrationRaw.name, sqsSchema, 'integration');
+export const IntegrationModel = dbserver?.model(IntegrationRaw.name, integrationSchema, 'integration');
 export type IntegrationModel = typeof IntegrationModel;

src/api/provider/sessions.ts

@@ -0,0 +1,150 @@
+import axios from 'axios';
+import { execSync } from 'child_process';
+
+import { Auth, ConfigService, ProviderSession } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+
+type ResponseSuccess = { status: number; data?: any };
+type ResponseProvider = Promise<[ResponseSuccess?, Error?]>;
+
+export class ProviderFiles {
+  constructor(private readonly configService: ConfigService) {
+    this.baseUrl = `http://${this.config.HOST}:${this.config.PORT}/session/${this.config.PREFIX}`;
+    this.globalApiToken = this.configService.get<Auth>('AUTHENTICATION').API_KEY.KEY;
+  }
+
+  private readonly logger = new Logger(ProviderFiles.name);
+
+  private baseUrl: string;
+  private globalApiToken: string;
+
+  private readonly config = Object.freeze(this.configService.get<ProviderSession>('PROVIDER'));
+
+  get isEnabled() {
+    return !!this.config?.ENABLED;
+  }
+
+  public async onModuleInit() {
+    if (this.config.ENABLED) {
+      const url = `http://${this.config.HOST}:${this.config.PORT}`;
+      try {
+        const response = await axios.options(url + '/ping');
+        if (response?.data != 'pong') {
+          throw new Error('Offline file provider.');
+        }
+
+        await axios.post(`${url}/session`, { group: this.config.PREFIX }, { headers: { apikey: this.globalApiToken } });
+      } catch (error) {
+        this.logger.error(['Failed to connect to the file server', error?.message, error?.stack]);
+        const pid = process.pid;
+        execSync(`kill -9 ${pid}`);
+      }
+    }
+  }
+
+  public async onModuleDestroy() {
+    //
+  }
+
+  public async create(instance: string): ResponseProvider {
+    try {
+      const response = await axios.post(
+        `${this.baseUrl}`,
+        {
+          instance,
+        },
+        { headers: { apikey: this.globalApiToken } },
+      );
+      return [{ status: response.status, data: response?.data }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+
+  public async write(instance: string, key: string, data: any): ResponseProvider {
+    try {
+      const response = await axios.post(`${this.baseUrl}/${instance}/${key}`, data, {
+        headers: { apikey: this.globalApiToken },
+      });
+      return [{ status: response.status, data: response?.data }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+
+  public async read(instance: string, key: string): ResponseProvider {
+    try {
+      const response = await axios.get(`${this.baseUrl}/${instance}/${key}`, {
+        headers: { apikey: this.globalApiToken },
+      });
+      return [{ status: response.status, data: response?.data }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+
+  public async delete(instance: string, key: string): ResponseProvider {
+    try {
+      const response = await axios.delete(`${this.baseUrl}/${instance}/${key}`, {
+        headers: { apikey: this.globalApiToken },
+      });
+      return [{ status: response.status, data: response?.data }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+
+  public async allInstances(): ResponseProvider {
+    try {
+      const response = await axios.get(`${this.baseUrl}/list-instances`, { headers: { apikey: this.globalApiToken } });
+      return [{ status: response.status, data: response?.data as string[] }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+
+  public async removeSession(instance: string): ResponseProvider {
+    try {
+      const response = await axios.delete(`${this.baseUrl}/${instance}`, { headers: { apikey: this.globalApiToken } });
+      return [{ status: response.status, data: response?.data }];
+    } catch (error) {
+      return [
+        {
+          status: error?.response?.status,
+          data: error?.response?.data,
+        },
+        error,
+      ];
+    }
+  }
+}

src/api/repository/auth.repository.ts

@@ -68,6 +68,20 @@ export class AuthRepository extends Repository {
     }
   }
 
+  public async findByKey(key: string): Promise<AuthRaw> {
+    try {
+      this.logger.verbose('finding auth');
+      if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding auth in db');
+        return await this.authModel.findOne({ apikey: key });
+      }
+
+      return {};
+    } catch (error) {
+      return {};
+    }
+  }
+
   public async list(): Promise<AuthRaw[]> {
     try {
       if (this.dbSettings.ENABLED) {

src/api/routes/chat.router.ts

@@ -6,6 +6,7 @@ import {
   blockUserSchema,
   contactValidateSchema,
   deleteMessageSchema,
+  markChatUnreadSchema,
   messageUpSchema,
   messageValidateSchema,
   presenceSchema,
@@ -24,6 +25,7 @@ import {
   BlockUserDto,
   DeleteMessage,
   getBase64FromMediaMessageDto,
+  MarkChatUnreadDto,
   NumberDto,
   PrivacySettingDto,
   ProfileNameDto,
@@ -98,6 +100,23 @@ export class ChatRouter extends RouterBroker {
 
         return res.status(HttpStatus.CREATED).json(response);
       })
+      .put(this.routerPath('markChatUnread'), ...guards, async (req, res) => {
+        logger.verbose('request received in markChatUnread');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
+        const response = await this.dataValidate<MarkChatUnreadDto>({
+          request: req,
+          schema: markChatUnreadSchema,
+          ClassRef: MarkChatUnreadDto,
+          execute: (instance, data) => chatController.markChatUnread(instance, data),
+        });
+
+        return res.status(HttpStatus.CREATED).json(response);
+      })
       .delete(this.routerPath('deleteMessageForEveryone'), ...guards, async (req, res) => {
         logger.verbose('request received in deleteMessageForEveryone');
         logger.verbose('request body: ');

src/api/routes/instance.router.ts

@@ -103,13 +103,15 @@ export class InstanceRouter extends RouterBroker {
         logger.verbose('request body: ');
         logger.verbose(req.body);
 
+        const key = req.get('apikey');
+
         logger.verbose('request query: ');
         logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: null,
           ClassRef: InstanceDto,
-          execute: (instance) => instanceController.fetchInstances(instance),
+          execute: (instance) => instanceController.fetchInstances(instance, key),
         });
 
         return res.status(HttpStatus.OK).json(response);

src/api/server.module.ts

@@ -1,5 +1,5 @@
 import { CacheEngine } from '../cache/cacheengine';
-import { configService } from '../config/env.config';
+import { configService, ProviderSession } from '../config/env.config';
 import { eventEmitter } from '../config/event.config';
 import { Logger } from '../config/logger.config';
 import { dbserver } from '../libs/db.connect';
@@ -47,6 +47,7 @@ import {
   WebsocketModel,
 } from './models';
 import { LabelModel } from './models/label.model';
+import { ProviderFiles } from './provider/sessions';
 import { AuthRepository } from './repository/auth.repository';
 import { ChatRepository } from './repository/chat.repository';
 import { ContactRepository } from './repository/contact.repository';
@@ -108,7 +109,13 @@ export const repository = new RepositoryBroker(
 
 export const cache = new CacheService(new CacheEngine(configService, 'instance').getEngine());
 const chatwootCache = new CacheService(new CacheEngine(configService, ChatwootService.name).getEngine());
-const messagesLostCache = new CacheService(new CacheEngine(configService, 'baileys').getEngine());
+const baileysCache = new CacheService(new CacheEngine(configService, 'baileys').getEngine());
+
+let providerFiles: ProviderFiles = null;
+
+if (configService.get<ProviderSession>('PROVIDER')?.ENABLED) {
+  providerFiles = new ProviderFiles(configService);
+}
 
 export const waMonitor = new WAMonitoringService(
   eventEmitter,
@@ -116,7 +123,8 @@ export const waMonitor = new WAMonitoringService(
   repository,
   cache,
   chatwootCache,
-  messagesLostCache,
+  baileysCache,
+  providerFiles,
 );
 
 const authService = new AuthService(configService, waMonitor, repository);
@@ -167,7 +175,8 @@ export const instanceController = new InstanceController(
   proxyController,
   cache,
   chatwootCache,
-  messagesLostCache,
+  baileysCache,
+  providerFiles,
 );
 export const sendMessageController = new SendMessageController(waMonitor);
 export const chatController = new ChatController(waMonitor);

src/api/services/cache.service.ts

@@ -1,4 +1,4 @@
-import { BufferJSON } from 'baileys';
+import { BufferJSON } from '@whiskeysockets/baileys';
 
 import { Logger } from '../../config/logger.config';
 import { ICache } from '../abstract/abstract.cache';

src/api/services/channel.service.ts

@@ -1,5 +1,5 @@
+import { WASocket } from '@whiskeysockets/baileys';
 import axios from 'axios';
-import { WASocket } from 'baileys';
 import { execSync } from 'child_process';
 import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
@@ -13,6 +13,7 @@ import {
   Database,
   HttpServer,
   Log,
+  Rabbitmq,
   Sqs,
   Webhook,
   Websocket,
@@ -305,6 +306,9 @@ export class ChannelStartupService {
     this.localChatwoot.conversation_pending = data?.conversation_pending;
     this.logger.verbose(`Chatwoot conversation pending: ${this.localChatwoot.conversation_pending}`);
 
+    this.localChatwoot.merge_brazil_contacts = data?.merge_brazil_contacts;
+    this.logger.verbose(`Chatwoot merge brazil contacts: ${this.localChatwoot.merge_brazil_contacts}`);
+
     this.localChatwoot.import_contacts = data?.import_contacts;
     this.logger.verbose(`Chatwoot import contacts: ${this.localChatwoot.import_contacts}`);
 
@@ -328,6 +332,7 @@ export class ChannelStartupService {
     this.logger.verbose(`Chatwoot sign delimiter: ${data.sign_delimiter}`);
     this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`);
     this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`);
+    this.logger.verbose(`Chatwoot merge brazil contacts: ${data.merge_brazil_contacts}`);
     this.logger.verbose(`Chatwoot import contacts: ${data.import_contacts}`);
     this.logger.verbose(`Chatwoot import messages: ${data.import_messages}`);
     this.logger.verbose(`Chatwoot days limit import messages: ${data.days_limit_import_messages}`);
@@ -356,6 +361,7 @@ export class ChannelStartupService {
     this.logger.verbose(`Chatwoot sign delimiter: ${data.sign_delimiter}`);
     this.logger.verbose(`Chatwoot reopen conversation: ${data.reopen_conversation}`);
     this.logger.verbose(`Chatwoot conversation pending: ${data.conversation_pending}`);
+    this.logger.verbose(`Chatwoot merge brazilian contacts: ${data.merge_brazil_contacts}`);
     this.logger.verbose(`Chatwoot import contacts: ${data.import_contacts}`);
     this.logger.verbose(`Chatwoot import messages: ${data.import_messages}`);
     this.logger.verbose(`Chatwoot days limit import messages: ${data.days_limit_import_messages}`);
@@ -370,6 +376,7 @@ export class ChannelStartupService {
       sign_delimiter: data.sign_delimiter || null,
       reopen_conversation: data.reopen_conversation,
       conversation_pending: data.conversation_pending,
+      merge_brazil_contacts: data.merge_brazil_contacts,
       import_contacts: data.import_contacts,
       import_messages: data.import_messages,
       days_limit_import_messages: data.days_limit_import_messages,
@@ -686,6 +693,9 @@ export class ChannelStartupService {
     const rabbitmqLocal = this.localRabbitmq.events;
     const sqsLocal = this.localSqs.events;
     const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
+    const rabbitmqEnabled = this.configService.get<Rabbitmq>('RABBITMQ').ENABLED;
+    const rabbitmqGlobal = this.configService.get<Rabbitmq>('RABBITMQ').GLOBAL_ENABLED;
+    const rabbitmqEvents = this.configService.get<Rabbitmq>('RABBITMQ').EVENTS;
     const we = event.replace(/[.-]/gm, '_').toUpperCase();
     const transformedWe = we.replace(/_/gm, '-').toLowerCase();
     const tzoffset = new Date().getTimezoneOffset() * 60000; //offset in milliseconds
@@ -696,19 +706,17 @@ export class ChannelStartupService {
     const tokenStore = await this.repository.auth.find(this.instanceName);
     const instanceApikey = tokenStore?.apikey || 'Apikey not found';
 
-    if (this.localRabbitmq.enabled) {
+    if (rabbitmqEnabled) {
       const amqp = getAMQP();
-
+      if (this.localRabbitmq.enabled && amqp) {
-      if (amqp) {
         if (Array.isArray(rabbitmqLocal) && rabbitmqLocal.includes(we)) {
           const exchangeName = this.instanceName ?? 'evolution_exchange';
 
-          // await amqp.assertExchange(exchangeName, 'topic', {
+          let retry = 0;
-          //   durable: true,
-          //   autoDelete: false,
-          // });
 
-          await this.assertExchangeAsync(amqp, exchangeName, 'topic', {
+          while (retry < 3) {
+            try {
+              await amqp.assertExchange(exchangeName, 'topic', {
                 durable: true,
                 autoDelete: false,
               });
@@ -758,6 +766,75 @@ export class ChannelStartupService {
 
                 this.logger.log(logData);
               }
+              break;
+            } catch (error) {
+              retry++;
+            }
+          }
+        }
+      }
+
+      if (rabbitmqGlobal && rabbitmqEvents[we] && amqp) {
+        const exchangeName = 'evolution_exchange';
+
+        let retry = 0;
+
+        while (retry < 3) {
+          try {
+            await amqp.assertExchange(exchangeName, 'topic', {
+              durable: true,
+              autoDelete: false,
+            });
+
+            const queueName = transformedWe;
+
+            await amqp.assertQueue(queueName, {
+              durable: true,
+              autoDelete: false,
+              arguments: {
+                'x-queue-type': 'quorum',
+              },
+            });
+
+            await amqp.bindQueue(queueName, exchangeName, event);
+
+            const message = {
+              event,
+              instance: this.instance.name,
+              data,
+              server_url: serverUrl,
+              date_time: now,
+              sender: this.wuid,
+            };
+
+            if (expose && instanceApikey) {
+              message['apikey'] = instanceApikey;
+            }
+            await amqp.publish(exchangeName, event, Buffer.from(JSON.stringify(message)));
+
+            if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
+              const logData = {
+                local: ChannelStartupService.name + '.sendData-RabbitMQ-Global',
+                event,
+                instance: this.instance.name,
+                data,
+                server_url: serverUrl,
+                apikey: (expose && instanceApikey) || null,
+                date_time: now,
+                sender: this.wuid,
+              };
+
+              if (expose && instanceApikey) {
+                logData['apikey'] = instanceApikey;
+              }
+
+              this.logger.log(logData);
+            }
+
+            break;
+          } catch (error) {
+            retry++;
+          }
         }
       }
     }

src/api/services/channels/whatsapp.baileys.service.ts

@@ -1,6 +1,5 @@
 import ffmpegPath from '@ffmpeg-installer/ffmpeg';
 import { Boom } from '@hapi/boom';
-import axios from 'axios';
 import makeWASocket, {
   AnyMessageContent,
   BufferedEventData,
@@ -36,9 +35,10 @@ import makeWASocket, {
   WAMessageUpdate,
   WAPresence,
   WASocket,
-} from 'baileys';
+} from '@whiskeysockets/baileys';
-import { Label } from 'baileys/lib/Types/Label';
+import { Label } from '@whiskeysockets/baileys/lib/Types/Label';
-import { LabelAssociation } from 'baileys/lib/Types/LabelAssociation';
+import { LabelAssociation } from '@whiskeysockets/baileys/lib/Types/LabelAssociation';
+import axios from 'axios';
 import { exec } from 'child_process';
 import { isBase64, isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
@@ -55,12 +55,23 @@ import qrcode, { QRCodeToDataURLOptions } from 'qrcode';
 import qrcodeTerminal from 'qrcode-terminal';
 import sharp from 'sharp';
 
-import { CacheConf, ConfigService, ConfigSessionPhone, Database, Log, QrCode } from '../../../config/env.config';
+import { CacheEngine } from '../../../cache/cacheengine';
+import {
+  CacheConf,
+  ConfigService,
+  configService,
+  ConfigSessionPhone,
+  Database,
+  Log,
+  ProviderSession,
+  QrCode,
+} from '../../../config/env.config';
 import { INSTANCE_DIR } from '../../../config/path.config';
 import { BadRequestException, InternalServerErrorException, NotFoundException } from '../../../exceptions';
 import { dbserver } from '../../../libs/db.connect';
 import { makeProxyAgent } from '../../../utils/makeProxyAgent';
 import { useMultiFileAuthStateDb } from '../../../utils/use-multi-file-auth-state-db';
+import { AuthStateProvider } from '../../../utils/use-multi-file-auth-state-provider-files';
 import { useMultiFileAuthStateRedisDb } from '../../../utils/use-multi-file-auth-state-redis-db';
 import {
   ArchiveChatDto,
@@ -68,6 +79,7 @@ import {
   DeleteMessage,
   getBase64FromMediaMessageDto,
   LastMessage,
+  MarkChatUnreadDto,
   NumberBusiness,
   OnWhatsAppDto,
   PrivacySettingDto,
@@ -113,12 +125,15 @@ import { SettingsRaw } from '../../models';
 import { ChatRaw } from '../../models/chat.model';
 import { ContactRaw } from '../../models/contact.model';
 import { MessageRaw, MessageUpdateRaw } from '../../models/message.model';
+import { ProviderFiles } from '../../provider/sessions';
 import { RepositoryBroker } from '../../repository/repository.manager';
 import { waMonitor } from '../../server.module';
 import { Events, MessageSubtype, TypeMediaMessage, wa } from '../../types/wa.types';
 import { CacheService } from './../cache.service';
 import { ChannelStartupService } from './../channel.service';
 
+const groupMetadataCache = new CacheService(new CacheEngine(configService, 'groups').getEngine());
+
 export class BaileysStartupService extends ChannelStartupService {
   constructor(
     public readonly configService: ConfigService,
@@ -126,7 +141,8 @@ export class BaileysStartupService extends ChannelStartupService {
     public readonly repository: RepositoryBroker,
     public readonly cache: CacheService,
     public readonly chatwootCache: CacheService,
-    public readonly messagesLostCache: CacheService,
+    public readonly baileysCache: CacheService,
+    private readonly providerFiles: ProviderFiles,
   ) {
     super(configService, eventEmitter, repository, chatwootCache);
     this.logger.verbose('BaileysStartupService initialized');
@@ -134,8 +150,12 @@ export class BaileysStartupService extends ChannelStartupService {
     this.instance.qrcode = { count: 0 };
     this.mobile = false;
     this.recoveringMessages();
+    this.forceUpdateGroupMetadataCache();
+
+    this.authStateProvider = new AuthStateProvider(this.providerFiles);
   }
 
+  private authStateProvider: AuthStateProvider;
   private readonly msgRetryCounterCache: CacheStore = new NodeCache();
   private readonly userDevicesCache: CacheStore = new NodeCache();
   private endSession = false;
@@ -152,9 +172,9 @@ export class BaileysStartupService extends ChannelStartupService {
 
     if ((cacheConf?.REDIS?.ENABLED && cacheConf?.REDIS?.URI !== '') || cacheConf?.LOCAL?.ENABLED) {
       setInterval(async () => {
-        this.messagesLostCache.keys().then((keys) => {
+        this.baileysCache.keys().then((keys) => {
           keys.forEach(async (key) => {
-            const message = await this.messagesLostCache.get(key.split(':')[2]);
+            const message = await this.baileysCache.get(key.split(':')[2]);
 
             if (message.messageStubParameters && message.messageStubParameters[0] === 'Message absent from node') {
               this.logger.info('Message absent from node, retrying to send, key: ' + key.split(':')[2]);
@@ -166,6 +186,23 @@ export class BaileysStartupService extends ChannelStartupService {
     }
   }
 
+  private async forceUpdateGroupMetadataCache() {
+    if (
+      !this.configService.get<CacheConf>('CACHE').REDIS.ENABLED &&
+      !this.configService.get<CacheConf>('CACHE').LOCAL.ENABLED
+    )
+      return;
+
+    setInterval(async () => {
+      this.logger.verbose('Forcing update group metadata cache');
+      const groups = await this.fetchAllGroups({ getParticipants: 'false' });
+
+      for (const group of groups) {
+        await this.updateGroupMetadataCache(group.id);
+      }
+    }, 3600000);
+  }
+
   public get connectionStatus() {
     this.logger.verbose('Getting connection status');
     return this.stateConnection;
@@ -460,6 +497,12 @@ export class BaileysStartupService extends ChannelStartupService {
     const db = this.configService.get<Database>('DATABASE');
     const cache = this.configService.get<CacheConf>('CACHE');
 
+    const provider = this.configService.get<ProviderSession>('PROVIDER');
+
+    if (provider?.ENABLED) {
+      return await this.authStateProvider.authStateProvider(this.instance.name);
+    }
+
     if (cache?.REDIS.ENABLED && cache?.REDIS.SAVE_INSTANCES) {
       this.logger.info('Redis enabled');
       return await useMultiFileAuthStateRedisDb(this.instance.name, this.cache);
@@ -495,13 +538,24 @@ export class BaileysStartupService extends ChannelStartupService {
         this.mobile = mobile;
       }
 
-      const { version } = await fetchLatestBaileysVersion();
-
-      this.logger.verbose('Baileys version: ' + version);
       const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
       const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
       this.logger.verbose('Browser: ' + JSON.stringify(browser));
 
+      let version;
+      let log;
+
+      if (session.VERSION) {
+        version = session.VERSION.split(',');
+        log = `Baileys version env: ${version}`;
+      } else {
+        const baileysVersion = await fetchLatestBaileysVersion();
+        version = baileysVersion.version;
+        log = `Baileys version: ${version}`;
+      }
+
+      this.logger.info(log);
+
       let options;
 
       if (this.localProxy.enabled) {
@@ -541,9 +595,12 @@ export class BaileysStartupService extends ChannelStartupService {
         browser: number ? ['Chrome (Linux)', session.NAME, release()] : browser,
         version,
         markOnlineOnConnect: this.localSettings.always_online,
-        retryRequestDelayMs: 10,
+        retryRequestDelayMs: 350,
-        connectTimeoutMs: 60_000,
+        maxMsgRetryCount: 4,
-        qrTimeout: 40_000,
+        fireInitQueries: true,
+        connectTimeoutMs: 20_000,
+        keepAliveIntervalMs: 30_000,
+        qrTimeout: 45_000,
         defaultQueryTimeoutMs: undefined,
         emitOwnEvents: false,
         shouldIgnoreJid: (jid) => {
@@ -560,7 +617,7 @@ export class BaileysStartupService extends ChannelStartupService {
           return this.historySyncNotification(msg);
         },
         userDevicesCache: this.userDevicesCache,
-        transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 10 },
+        transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 2500 },
         patchMessageBeforeSending(message) {
           if (
             message.deviceSentMessage?.message?.listMessage?.listType ===
@@ -616,12 +673,8 @@ export class BaileysStartupService extends ChannelStartupService {
       return;
     }
 
-    console.log('phoneNumber', phoneNumber);
-
     const parsedPhoneNumber = parsePhoneNumber(phoneNumber);
 
-    console.log('parsedPhoneNumber', parsedPhoneNumber);
-
     if (!parsedPhoneNumber?.isValid()) {
       this.logger.error('Phone number invalid');
       return;
@@ -643,7 +696,6 @@ export class BaileysStartupService extends ChannelStartupService {
     try {
       const response = await this.client.requestRegistrationCode(registration);
 
-      console.log('response', response);
       if (['ok', 'sent'].includes(response?.status)) {
         this.logger.verbose('Registration code sent successfully');
 
@@ -657,9 +709,8 @@ export class BaileysStartupService extends ChannelStartupService {
   public async receiveMobileCode(code: string) {
     await this.client
       .register(code.replace(/["']/g, '').trim().toLowerCase())
-      .then(async (response) => {
+      .then(async () => {
         this.logger.verbose('Registration code received successfully');
-        console.log(response);
       })
       .catch((error) => {
         this.logger.error(error);
@@ -670,10 +721,23 @@ export class BaileysStartupService extends ChannelStartupService {
     try {
       this.instance.authState = await this.defineAuthState();
 
-      const { version } = await fetchLatestBaileysVersion();
       const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
       const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
 
+      let version;
+      let log;
+
+      if (session.VERSION) {
+        version = session.VERSION.split(',');
+        log = `Baileys version env: ${version}`;
+      } else {
+        const baileysVersion = await fetchLatestBaileysVersion();
+        version = baileysVersion.version;
+        log = `Baileys version: ${version}`;
+      }
+
+      this.logger.info(log);
+
       let options;
 
       if (this.localProxy.enabled) {
@@ -709,12 +773,16 @@ export class BaileysStartupService extends ChannelStartupService {
         },
         logger: P({ level: this.logBaileys }),
         printQRInTerminal: false,
+        mobile: this.mobile,
         browser: this.phoneNumber ? ['Chrome (Linux)', session.NAME, release()] : browser,
         version,
         markOnlineOnConnect: this.localSettings.always_online,
-        retryRequestDelayMs: 10,
+        retryRequestDelayMs: 350,
-        connectTimeoutMs: 60_000,
+        maxMsgRetryCount: 4,
-        qrTimeout: 40_000,
+        fireInitQueries: true,
+        connectTimeoutMs: 20_000,
+        keepAliveIntervalMs: 30_000,
+        qrTimeout: 45_000,
         defaultQueryTimeoutMs: undefined,
         emitOwnEvents: false,
         shouldIgnoreJid: (jid) => {
@@ -731,7 +799,7 @@ export class BaileysStartupService extends ChannelStartupService {
           return this.historySyncNotification(msg);
         },
         userDevicesCache: this.userDevicesCache,
-        transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 10 },
+        transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 2500 },
         patchMessageBeforeSending(message) {
           if (
             message.deviceSentMessage?.message?.listMessage?.listType ===
@@ -1080,15 +1148,15 @@ export class BaileysStartupService extends ChannelStartupService {
           if (received.messageStubParameters && received.messageStubParameters[0] === 'Message absent from node') {
             this.logger.info('Recovering message lost');
 
-            await this.messagesLostCache.set(received.key.id, received);
+            await this.baileysCache.set(received.key.id, received);
             continue;
           }
 
-          const retryCache = (await this.messagesLostCache.get(received.key.id)) || null;
+          const retryCache = (await this.baileysCache.get(received.key.id)) || null;
 
           if (retryCache) {
             this.logger.info('Recovered message lost');
-            await this.messagesLostCache.delete(received.key.id);
+            await this.baileysCache.delete(received.key.id);
           }
 
           if (
@@ -1377,6 +1445,12 @@ export class BaileysStartupService extends ChannelStartupService {
 
       this.logger.verbose('Sending data to webhook in event GROUPS_UPDATE');
       this.sendDataWebhook(Events.GROUPS_UPDATE, groupMetadataUpdate);
+
+      groupMetadataUpdate.forEach((group) => {
+        if (isJidGroup(group.id)) {
+          this.updateGroupMetadataCache(group.id);
+        }
+      });
     },
 
     'group-participants.update': (participantsUpdate: {
@@ -1434,7 +1508,7 @@ export class BaileysStartupService extends ChannelStartupService {
       this.logger.verbose('Sending data to webhook in event LABELS_ASSOCIATION');
 
       // Atualiza labels nos chats
-      if (database.SAVE_DATA.CHATS) {
+      if (database.ENABLED && database.SAVE_DATA.CHATS) {
         const chats = await this.repository.chat.find({
           where: {
             owner: this.instance.name,
@@ -1813,7 +1887,11 @@ export class BaileysStartupService extends ChannelStartupService {
       let mentions: string[];
       if (isJidGroup(sender)) {
         try {
-          const group = await this.findGroup({ groupJid: sender }, 'inner');
+          let group;
+
+          const cache = this.configService.get<CacheConf>('CACHE');
+          if (!cache.REDIS.ENABLED && !cache.LOCAL.ENABLED) group = await this.findGroup({ groupJid: sender }, 'inner');
+          else group = await this.getGroupMetadataCache(sender);
 
           if (!group) {
             throw new NotFoundException('Group not found');
@@ -1866,7 +1944,14 @@ export class BaileysStartupService extends ChannelStartupService {
                   key: message['reactionMessage']['key'],
                 },
               } as unknown as AnyMessageContent,
-              option as unknown as MiscMessageGenerationOptions,
+              {
+                ...option,
+                cachedGroupMetadata:
+                  !this.configService.get<CacheConf>('CACHE').REDIS.ENABLED &&
+                  !this.configService.get<CacheConf>('CACHE').LOCAL.ENABLED
+                    ? null
+                    : this.getGroupMetadataCache,
+              } as unknown as MiscMessageGenerationOptions,
             );
           }
         }
@@ -1879,7 +1964,14 @@ export class BaileysStartupService extends ChannelStartupService {
               mentions,
               linkPreview: linkPreview,
             } as unknown as AnyMessageContent,
-            option as unknown as MiscMessageGenerationOptions,
+            {
+              ...option,
+              cachedGroupMetadata:
+                !this.configService.get<CacheConf>('CACHE').REDIS.ENABLED &&
+                !this.configService.get<CacheConf>('CACHE').LOCAL.ENABLED
+                  ? null
+                  : this.getGroupMetadataCache,
+            } as unknown as MiscMessageGenerationOptions,
           );
         }
 
@@ -1894,7 +1986,14 @@ export class BaileysStartupService extends ChannelStartupService {
               },
               mentions,
             },
-            option as unknown as MiscMessageGenerationOptions,
+            {
+              ...option,
+              cachedGroupMetadata:
+                !this.configService.get<CacheConf>('CACHE').REDIS.ENABLED &&
+                !this.configService.get<CacheConf>('CACHE').LOCAL.ENABLED
+                  ? null
+                  : this.getGroupMetadataCache,
+            } as unknown as MiscMessageGenerationOptions,
           );
         }
 
@@ -1915,7 +2014,14 @@ export class BaileysStartupService extends ChannelStartupService {
         return await this.client.sendMessage(
           sender,
           message as unknown as AnyMessageContent,
-          option as unknown as MiscMessageGenerationOptions,
+          {
+            ...option,
+            cachedGroupMetadata:
+              !this.configService.get<CacheConf>('CACHE').REDIS.ENABLED &&
+              !this.configService.get<CacheConf>('CACHE').LOCAL.ENABLED
+                ? null
+                : this.getGroupMetadataCache,
+          } as unknown as MiscMessageGenerationOptions,
         );
       })();
 
@@ -1970,18 +2076,37 @@ export class BaileysStartupService extends ChannelStartupService {
 
       const sender = isWA.jid;
 
-      this.logger.verbose('Sending presence');
+      if (data?.options?.delay && data?.options?.delay > 20000) {
+        let remainingDelay = data?.options.delay;
+        while (remainingDelay > 20000) {
           await this.client.presenceSubscribe(sender);
-      this.logger.verbose('Subscribing to presence');
 
-      await this.client.sendPresenceUpdate(data.options?.presence ?? 'composing', sender);
+          await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);
-      this.logger.verbose('Sending presence update: ' + data.options?.presence ?? 'composing');
 
-      await delay(data.options.delay);
+          await delay(20000);
-      this.logger.verbose('Set delay: ' + data.options.delay);
 
           await this.client.sendPresenceUpdate('paused', sender);
-      this.logger.verbose('Sending presence update: paused');
+
+          remainingDelay -= 20000;
+        }
+        if (remainingDelay > 0) {
+          await this.client.presenceSubscribe(sender);
+
+          await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);
+
+          await delay(remainingDelay);
+
+          await this.client.sendPresenceUpdate('paused', sender);
+        }
+      } else {
+        await this.client.presenceSubscribe(sender);
+
+        await this.client.sendPresenceUpdate((data?.options?.presence as WAPresence) ?? 'composing', sender);
+
+        await delay(data?.options?.delay);
+
+        await this.client.sendPresenceUpdate('paused', sender);
+      }
     } catch (error) {
       this.logger.error(error);
       throw new BadRequestException(error.toString());
@@ -2714,6 +2839,45 @@ export class BaileysStartupService extends ChannelStartupService {
     }
   }
 
+  public async markChatUnread(data: MarkChatUnreadDto) {
+    this.logger.verbose('Marking chat as unread');
+
+    try {
+      let last_message = data.lastMessage;
+      let number = data.chat;
+
+      if (!last_message && number) {
+        last_message = await this.getLastMessage(number);
+      } else {
+        last_message = data.lastMessage;
+        last_message.messageTimestamp = last_message?.messageTimestamp ?? Date.now();
+        number = last_message?.key?.remoteJid;
+      }
+
+      if (!last_message || Object.keys(last_message).length === 0) {
+        throw new NotFoundException('Last message not found');
+      }
+
+      await this.client.chatModify(
+        {
+          markRead: false,
+          lastMessages: [last_message],
+        },
+        this.createJid(number),
+      );
+
+      return {
+        chatId: number,
+        markedChatUnread: true,
+      };
+    } catch (error) {
+      throw new InternalServerErrorException({
+        markedChatUnread: false,
+        message: ['An error occurred while marked unread the chat. Open a calling.', error.toString()],
+      });
+    }
+  }
+
   public async deleteMessage(del: DeleteMessage) {
     this.logger.verbose('Deleting message');
     try {
@@ -3062,6 +3226,38 @@ export class BaileysStartupService extends ChannelStartupService {
   }
 
   // Group
+  private async updateGroupMetadataCache(groupJid: string) {
+    try {
+      const meta = await this.client.groupMetadata(groupJid);
+      await groupMetadataCache.set(groupJid, {
+        timestamp: Date.now(),
+        data: meta,
+      });
+
+      return meta;
+    } catch (error) {
+      this.logger.error(error);
+      return null;
+    }
+  }
+
+  private async getGroupMetadataCache(groupJid: string) {
+    if (!isJidGroup(groupJid)) return null;
+
+    if (await groupMetadataCache.has(groupJid)) {
+      console.log('Has cache for group: ' + groupJid);
+      const meta = await groupMetadataCache.get(groupJid);
+
+      if (Date.now() - meta.timestamp > 3600000) {
+        await this.updateGroupMetadataCache(groupJid);
+      }
+
+      return meta.data;
+    }
+
+    return await this.updateGroupMetadataCache(groupJid);
+  }
+
   public async createGroup(create: CreateGroupDto) {
     this.logger.verbose('Creating group: ' + create.subject);
     try {

src/api/services/channels/whatsapp.business.service.ts

@@ -23,6 +23,7 @@ import {
   SendTextDto,
 } from '../../dto/sendMessage.dto';
 import { ContactRaw, MessageRaw, MessageUpdateRaw, SettingsRaw } from '../../models';
+import { ProviderFiles } from '../../provider/sessions';
 import { RepositoryBroker } from '../../repository/repository.manager';
 import { Events, wa } from '../../types/wa.types';
 import { CacheService } from './../cache.service';
@@ -35,7 +36,8 @@ export class BusinessStartupService extends ChannelStartupService {
     public readonly repository: RepositoryBroker,
     public readonly cache: CacheService,
     public readonly chatwootCache: CacheService,
-    public readonly messagesLostCache: CacheService,
+    public readonly baileysCache: CacheService,
+    private readonly providerFiles: ProviderFiles,
   ) {
     super(configService, eventEmitter, repository, chatwootCache);
     this.logger.verbose('BusinessStartupService initialized');
@@ -1258,6 +1260,9 @@ export class BusinessStartupService extends ChannelStartupService {
   public async archiveChat() {
     throw new BadRequestException('Method not available on WhatsApp Business API');
   }
+  public async markChatUnread() {
+    throw new BadRequestException('Method not available on WhatsApp Business API');
+  }
   public async fetchProfile() {
     throw new BadRequestException('Method not available on WhatsApp Business API');
   }

src/api/services/monitor.service.ts

@@ -5,7 +5,15 @@ import { Db } from 'mongodb';
 import { Collection } from 'mongoose';
 import { join } from 'path';
 
-import { Auth, CacheConf, ConfigService, Database, DelInstance, HttpServer } from '../../config/env.config';
+import {
+  Auth,
+  CacheConf,
+  ConfigService,
+  Database,
+  DelInstance,
+  HttpServer,
+  ProviderSession,
+} from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
 import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
 import { NotFoundException } from '../../exceptions';
@@ -22,6 +30,7 @@ import {
   WebhookModel,
   WebsocketModel,
 } from '../models';
+import { ProviderFiles } from '../provider/sessions';
 import { RepositoryBroker } from '../repository/repository.manager';
 import { Integration } from '../types/wa.types';
 import { CacheService } from './cache.service';
@@ -35,7 +44,8 @@ export class WAMonitoringService {
     private readonly repository: RepositoryBroker,
     private readonly cache: CacheService,
     private readonly chatwootCache: CacheService,
-    private readonly messagesLostCache: CacheService,
+    private readonly baileysCache: CacheService,
+    private readonly providerFiles: ProviderFiles,
   ) {
     this.logger.verbose('instance created');
 
@@ -58,6 +68,8 @@ export class WAMonitoringService {
   private readonly logger = new Logger(WAMonitoringService.name);
   public readonly waInstances: Record<string, BaileysStartupService | BusinessStartupService> = {};
 
+  private readonly providerSession = Object.freeze(this.configService.get<ProviderSession>('PROVIDER'));
+
   public delInstanceTime(instance: string) {
     const time = this.configService.get<DelInstance>('DEL_INSTANCE');
     if (typeof time === 'number' && time > 0) {
@@ -83,7 +95,7 @@ export class WAMonitoringService {
     }
   }
 
-  public async instanceInfo(instanceName?: string) {
+  public async instanceInfo(instanceName?: string, arrayReturn = false) {
     this.logger.verbose('get instance info');
     if (instanceName && !this.waInstances[instanceName]) {
       throw new NotFoundException(`Instance "${instanceName}" not found`);
@@ -171,6 +183,9 @@ export class WAMonitoringService {
 
     this.logger.verbose('return instance info: ' + instances.length);
 
+    if (arrayReturn) {
+      return [instances.find((i) => i.instance.instanceName === instanceName) ?? instances];
+    }
     return instances.find((i) => i.instance.instanceName === instanceName) ?? instances;
   }
 
@@ -254,12 +269,18 @@ export class WAMonitoringService {
     }
 
     this.logger.verbose('cleaning up instance in files: ' + instanceName);
+    if (this.providerSession?.ENABLED) {
+      await this.providerFiles.removeSession(instanceName);
+    }
     rmSync(join(INSTANCE_DIR, instanceName), { recursive: true, force: true });
   }
 
   public async cleaningStoreFiles(instanceName: string) {
     if (!this.db.ENABLED) {
       this.logger.verbose('cleaning store files instance: ' + instanceName);
+      if (this.providerSession?.ENABLED) {
+        await this.providerFiles.removeSession(instanceName);
+      }
       rmSync(join(INSTANCE_DIR, instanceName), { recursive: true, force: true });
 
       execSync(`rm -rf ${join(STORE_DIR, 'chats', instanceName)}`);
@@ -302,7 +323,9 @@ export class WAMonitoringService {
     this.logger.verbose('Loading instances');
 
     try {
-      if (this.redis.REDIS.ENABLED && this.redis.REDIS.SAVE_INSTANCES) {
+      if (this.providerSession?.ENABLED) {
+        await this.loadInstancesFromProvider();
+      } else if (this.redis.REDIS.ENABLED && this.redis.REDIS.SAVE_INSTANCES) {
         await this.loadInstancesFromRedis();
       } else if (this.db.ENABLED && this.db.SAVE_DATA.INSTANCE) {
         await this.loadInstancesFromDatabase();
@@ -345,7 +368,8 @@ export class WAMonitoringService {
         this.repository,
         this.cache,
         this.chatwootCache,
-        this.messagesLostCache,
+        this.baileysCache,
+        this.providerFiles,
       );
 
       instance.instanceName = name;
@@ -356,7 +380,8 @@ export class WAMonitoringService {
         this.repository,
         this.cache,
         this.chatwootCache,
-        this.messagesLostCache,
+        this.baileysCache,
+        this.providerFiles,
       );
 
       instance.instanceName = name;
@@ -398,6 +423,18 @@ export class WAMonitoringService {
     }
   }
 
+  private async loadInstancesFromProvider() {
+    this.logger.verbose('Provider in files enabled');
+    const [instances] = await this.providerFiles.allInstances();
+
+    if (!instances?.data) {
+      this.logger.verbose('No instances found');
+      return;
+    }
+
+    await Promise.all(instances?.data?.map(async (instanceName: string) => this.setInstance(instanceName)));
+  }
+
   private async loadInstancesFromFiles() {
     this.logger.verbose('Store in files enabled');
     const dir = opendirSync(INSTANCE_DIR, { encoding: 'utf-8' });

src/api/types/wa.types.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-import { AuthenticationState, WAConnectionState } from 'baileys';
+import { AuthenticationState, WAConnectionState } from '@whiskeysockets/baileys';
 
 export enum Events {
   APPLICATION_STARTUP = 'application.startup',
@@ -69,6 +69,7 @@ export declare namespace wa {
     number?: string;
     reopen_conversation?: boolean;
     conversation_pending?: boolean;
+    merge_brazil_contacts?: boolean;
     import_contacts?: boolean;
     import_messages?: boolean;
     days_limit_import_messages?: number;

src/cache/rediscache.ts

@@ -1,4 +1,4 @@
-import { BufferJSON } from 'baileys';
+import { BufferJSON } from '@whiskeysockets/baileys';
 import { RedisClientType } from 'redis';
 
 import { ICache } from '../api/abstract/abstract.cache';

src/config/env.config.ts

@@ -28,6 +28,13 @@ export type Log = {
   BAILEYS: LogBaileys;
 };
 
+export type ProviderSession = {
+  ENABLED: boolean;
+  HOST: string;
+  PORT: string;
+  PREFIX: string;
+};
+
 export type SaveData = {
   INSTANCE: boolean;
   NEW_MESSAGE: boolean;
@@ -63,11 +70,42 @@ export type Database = {
   SAVE_DATA: SaveData;
 };
 
+export type EventsRabbitmq = {
+  APPLICATION_STARTUP: boolean;
+  INSTANCE_CREATE: boolean;
+  INSTANCE_DELETE: boolean;
+  QRCODE_UPDATED: boolean;
+  MESSAGES_SET: boolean;
+  MESSAGES_UPSERT: boolean;
+  MESSAGES_UPDATE: boolean;
+  MESSAGES_DELETE: boolean;
+  SEND_MESSAGE: boolean;
+  CONTACTS_SET: boolean;
+  CONTACTS_UPDATE: boolean;
+  CONTACTS_UPSERT: boolean;
+  PRESENCE_UPDATE: boolean;
+  CHATS_SET: boolean;
+  CHATS_UPDATE: boolean;
+  CHATS_DELETE: boolean;
+  CHATS_UPSERT: boolean;
+  CONNECTION_UPDATE: boolean;
+  LABELS_EDIT: boolean;
+  LABELS_ASSOCIATION: boolean;
+  GROUPS_UPSERT: boolean;
+  GROUP_UPDATE: boolean;
+  GROUP_PARTICIPANTS_UPDATE: boolean;
+  CALL: boolean;
+  NEW_JWT_TOKEN: boolean;
+  TYPEBOT_START: boolean;
+  TYPEBOT_CHANGE_STATUS: boolean;
+};
+
 export type Rabbitmq = {
   ENABLED: boolean;
-  MODE: string; // global, single, isolated
-  EXCHANGE_NAME: string; // available for global and single, isolated mode will use instance name as exchange
   URI: string;
+  EXCHANGE_NAME: string;
+  GLOBAL_ENABLED: boolean;
+  EVENTS: EventsRabbitmq;
 };
 
 export type Sqs = {
@@ -155,7 +193,7 @@ export type CacheConfLocal = {
 };
 export type SslConf = { PRIVKEY: string; FULLCHAIN: string };
 export type Webhook = { GLOBAL?: GlobalWebhook; EVENTS: EventsWebhook };
-export type ConfigSessionPhone = { CLIENT: string; NAME: string };
+export type ConfigSessionPhone = { CLIENT: string; NAME: string; VERSION: string };
 export type QrCode = { LIMIT: number; COLOR: string };
 export type Typebot = { API_VERSION: string; KEEP_OPEN: boolean };
 export type Chatwoot = {
@@ -178,6 +216,7 @@ export interface Env {
   SERVER: HttpServer;
   CORS: Cors;
   SSL_CONF: SslConf;
+  PROVIDER: ProviderSession;
   STORE: StoreConf;
   CLEAN_STORE: CleanStoreConf;
   DATABASE: Database;
@@ -243,6 +282,12 @@ export class ConfigService {
         PRIVKEY: process.env?.SSL_CONF_PRIVKEY || '',
         FULLCHAIN: process.env?.SSL_CONF_FULLCHAIN || '',
       },
+      PROVIDER: {
+        ENABLED: process.env?.PROVIDER_ENABLED === 'true',
+        HOST: process.env.PROVIDER_HOST,
+        PORT: process.env?.PROVIDER_PORT || '5656',
+        PREFIX: process.env?.PROVIDER_PREFIX || 'evolution',
+      },
       STORE: {
         MESSAGES: process.env?.STORE_MESSAGES === 'true',
         MESSAGE_UP: process.env?.STORE_MESSAGE_UP === 'true',
@@ -251,8 +296,8 @@ export class ConfigService {
         LABELS: process.env?.STORE_LABELS === 'true',
       },
       CLEAN_STORE: {
-        CLEANING_INTERVAL: Number.isInteger(process.env?.CLEAN_STORE_CLEANING_TERMINAL)
+        CLEANING_INTERVAL: Number.isInteger(process.env?.CLEAN_STORE_CLEANING_INTERVAL)
-          ? Number.parseInt(process.env.CLEAN_STORE_CLEANING_TERMINAL)
+          ? Number.parseInt(process.env.CLEAN_STORE_CLEANING_INTERVAL)
           : 7200,
         MESSAGES: process.env?.CLEAN_STORE_MESSAGES === 'true',
         MESSAGE_UP: process.env?.CLEAN_STORE_MESSAGE_UP === 'true',
@@ -276,9 +321,38 @@ export class ConfigService {
       },
       RABBITMQ: {
         ENABLED: process.env?.RABBITMQ_ENABLED === 'true',
-        MODE: process.env?.RABBITMQ_MODE || 'isolated',
+        GLOBAL_ENABLED: process.env?.RABBITMQ_GLOBAL_ENABLED === 'true',
         EXCHANGE_NAME: process.env?.RABBITMQ_EXCHANGE_NAME || 'evolution_exchange',
         URI: process.env.RABBITMQ_URI || '',
+        EVENTS: {
+          APPLICATION_STARTUP: process.env?.RABBITMQ_EVENTS_APPLICATION_STARTUP === 'true',
+          INSTANCE_CREATE: process.env?.RABBITMQ_EVENTS_INSTANCE_CREATE === 'true',
+          INSTANCE_DELETE: process.env?.RABBITMQ_EVENTS_INSTANCE_DELETE === 'true',
+          QRCODE_UPDATED: process.env?.RABBITMQ_EVENTS_QRCODE_UPDATED === 'true',
+          MESSAGES_SET: process.env?.RABBITMQ_EVENTS_MESSAGES_SET === 'true',
+          MESSAGES_UPSERT: process.env?.RABBITMQ_EVENTS_MESSAGES_UPSERT === 'true',
+          MESSAGES_UPDATE: process.env?.RABBITMQ_EVENTS_MESSAGES_UPDATE === 'true',
+          MESSAGES_DELETE: process.env?.RABBITMQ_EVENTS_MESSAGES_DELETE === 'true',
+          SEND_MESSAGE: process.env?.RABBITMQ_EVENTS_SEND_MESSAGE === 'true',
+          CONTACTS_SET: process.env?.RABBITMQ_EVENTS_CONTACTS_SET === 'true',
+          CONTACTS_UPDATE: process.env?.RABBITMQ_EVENTS_CONTACTS_UPDATE === 'true',
+          CONTACTS_UPSERT: process.env?.RABBITMQ_EVENTS_CONTACTS_UPSERT === 'true',
+          PRESENCE_UPDATE: process.env?.RABBITMQ_EVENTS_PRESENCE_UPDATE === 'true',
+          CHATS_SET: process.env?.RABBITMQ_EVENTS_CHATS_SET === 'true',
+          CHATS_UPDATE: process.env?.RABBITMQ_EVENTS_CHATS_UPDATE === 'true',
+          CHATS_UPSERT: process.env?.RABBITMQ_EVENTS_CHATS_UPSERT === 'true',
+          CHATS_DELETE: process.env?.RABBITMQ_EVENTS_CHATS_DELETE === 'true',
+          CONNECTION_UPDATE: process.env?.RABBITMQ_EVENTS_CONNECTION_UPDATE === 'true',
+          LABELS_EDIT: process.env?.RABBITMQ_EVENTS_LABELS_EDIT === 'true',
+          LABELS_ASSOCIATION: process.env?.RABBITMQ_EVENTS_LABELS_ASSOCIATION === 'true',
+          GROUPS_UPSERT: process.env?.RABBITMQ_EVENTS_GROUPS_UPSERT === 'true',
+          GROUP_UPDATE: process.env?.RABBITMQ_EVENTS_GROUPS_UPDATE === 'true',
+          GROUP_PARTICIPANTS_UPDATE: process.env?.RABBITMQ_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
+          CALL: process.env?.RABBITMQ_EVENTS_CALL === 'true',
+          NEW_JWT_TOKEN: process.env?.RABBITMQ_EVENTS_NEW_JWT_TOKEN === 'true',
+          TYPEBOT_START: process.env?.RABBITMQ_EVENTS_TYPEBOT_START === 'true',
+          TYPEBOT_CHANGE_STATUS: process.env?.RABBITMQ_EVENTS_TYPEBOT_CHANGE_STATUS === 'true',
+        },
       },
       SQS: {
         ENABLED: process.env?.SQS_ENABLED === 'true',
@@ -360,6 +434,7 @@ export class ConfigService {
       CONFIG_SESSION_PHONE: {
         CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT || 'Evolution API',
         NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'Chrome',
+        VERSION: process.env?.CONFIG_SESSION_PHONE_VERSION || null,
       },
       QRCODE: {
         LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30,

src/dev-env.yml

@@ -49,6 +49,14 @@ LOG:
 DEL_INSTANCE: false # or false
 DEL_TEMP_INSTANCES: true # Delete instances with status closed on start
 
+# Seesion Files Providers
+# Provider responsible for managing credentials files and WhatsApp sessions.
+PROVIDER:
+  ENABLED: true
+  HOST: 127.0.0.1
+  PORT: 5656
+  PREFIX: evolution
+
 # Temporary data storage
 STORE:
   MESSAGES: true
@@ -79,9 +87,35 @@ DATABASE:
 
 RABBITMQ:
   ENABLED: false
-  MODE: "global"
-  EXCHANGE_NAME: "evolution_exchange"
   URI: "amqp://guest:guest@localhost:5672"
+  EXCHANGE_NAME: evolution_exchange
+  GLOBAL_ENABLED: true
+  EVENTS:
+    APPLICATION_STARTUP: false
+    INSTANCE_CREATE: false
+    INSTANCE_DELETE: false
+    QRCODE_UPDATED: false
+    MESSAGES_SET: false
+    MESSAGES_UPSERT: true
+    MESSAGES_UPDATE: true
+    MESSAGES_DELETE: false
+    SEND_MESSAGE: false
+    CONTACTS_SET: false
+    CONTACTS_UPSERT: false
+    CONTACTS_UPDATE: false
+    PRESENCE_UPDATE: false
+    CHATS_SET: false
+    CHATS_UPSERT: false
+    CHATS_UPDATE: false
+    CHATS_DELETE: false
+    GROUPS_UPSERT: true
+    GROUP_UPDATE: true
+    GROUP_PARTICIPANTS_UPDATE: true
+    CONNECTION_UPDATE: true
+    CALL: false
+    # This events is used with Typebot
+    TYPEBOT_START: false
+    TYPEBOT_CHANGE_STATUS: false
 
 SQS:
   ENABLED: true
@@ -168,7 +202,7 @@ CHATWOOT:
     # This db connection is used to import messages from whatsapp to chatwoot database
     DATABASE:
       CONNECTION:
-        URI: "postgres://user:password@hostname:port/dbname"
+        URI: "postgres://user:password@hostname:port/dbname?sslmode=disable"
     PLACEHOLDER_MEDIA_MESSAGE: true
 
 # Cache to optimize application performance

src/docs/swagger.yaml

@@ -25,7 +25,7 @@ info:
     </font>
 
     [![Run in Postman](https://run.pstmn.io/button.svg)](https://god.gw.postman.com/run-collection/26869335-5546d063-156b-4529-915f-909dd628c090?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D26869335-5546d063-156b-4529-915f-909dd628c090%26entityType%3Dcollection%26workspaceId%3D339a4ee7-378b-45c9-b5b8-fd2c0a9c2442)
-  version: 1.7.4
+  version: 1.8.0
   contact:
     name: DavidsonGomes
     email: contato@agenciadgcode.com
@@ -194,6 +194,8 @@ paths:
             type: string
           description: Check the connection state of your instance.
           example: "evolution"
+      security:
+        - apikeyAuth: []
       responses:
         "200":
           description: Successful response
@@ -2242,6 +2244,9 @@ paths:
                 conversation_pending:
                   type: boolean
                   description: "Indicates whether to mark conversations as pending."
+                merge_brazil_contacts:
+                  type: boolean
+                  description: "Indicates whether to merge Brazil numbers in case of numbers with and without ninth digit."
                 import_contacts:
                   type: boolean
                   description: "Indicates whether to import contacts from phone to Chatwoot when connecting."

src/main.ts

@@ -6,12 +6,13 @@ import cors from 'cors';
 import express, { json, NextFunction, Request, Response, urlencoded } from 'express';
 import { join } from 'path';
 
-import { initAMQP } from './api/integrations/rabbitmq/libs/amqp.server';
+import { initAMQP, initGlobalQueues } from './api/integrations/rabbitmq/libs/amqp.server';
 import { initSQS } from './api/integrations/sqs/libs/sqs.server';
 import { initIO } from './api/integrations/websocket/libs/socket.server';
+import { ProviderFiles } from './api/provider/sessions';
 import { HttpStatus, router } from './api/routes/index.router';
 import { waMonitor } from './api/server.module';
-import { Auth, configService, Cors, HttpServer, Rabbitmq, Sqs, Webhook } from './config/env.config';
+import { Auth, configService, Cors, HttpServer, ProviderSession, Rabbitmq, Sqs, Webhook } from './config/env.config';
 import { onUnexpectedError } from './config/error.config';
 import { Logger } from './config/logger.config';
 import { ROOT_DIR } from './config/path.config';
@@ -22,10 +23,18 @@ function initWA() {
   waMonitor.loadInstance();
 }
 
-function bootstrap() {
+async function bootstrap() {
   const logger = new Logger('SERVER');
   const app = express();
 
+  let providerFiles: ProviderFiles = null;
+
+  if (configService.get<ProviderSession>('PROVIDER')?.ENABLED) {
+    providerFiles = new ProviderFiles(configService);
+    await providerFiles.onModuleInit();
+    logger.info('Provider:Files - ON');
+  }
+
   app.use(
     cors({
       origin(requestOrigin, callback) {
@@ -128,7 +137,11 @@ function bootstrap() {
 
   initIO(server);
 
-  if (configService.get<Rabbitmq>('RABBITMQ')?.ENABLED) initAMQP();
+  if (configService.get<Rabbitmq>('RABBITMQ')?.ENABLED) {
+    initAMQP().then(() => {
+      if (configService.get<Rabbitmq>('RABBITMQ')?.GLOBAL_ENABLED) initGlobalQueues();
+    });
+  }
 
   if (configService.get<Sqs>('SQS')?.ENABLED) initSQS();
 

src/utils/use-multi-file-auth-state-db.ts

@@ -1,4 +1,11 @@
-import { AuthenticationCreds, AuthenticationState, BufferJSON, initAuthCreds, proto, SignalDataTypeMap } from 'baileys';
+import {
+  AuthenticationCreds,
+  AuthenticationState,
+  BufferJSON,
+  initAuthCreds,
+  proto,
+  SignalDataTypeMap,
+} from '@whiskeysockets/baileys';
 
 import { configService, Database } from '../config/env.config';
 import { Logger } from '../config/logger.config';

src/utils/use-multi-file-auth-state-provider-files.ts

@@ -0,0 +1,139 @@
+/**
+ * ┌──────────────────────────────────────────────────────────────────────────────┐
+ * │ @author jrCleber                                                             │
+ * │ @filename use-multi-file-auth-state-provider-files.ts                              │
+ * │ Developed by: Cleber Wilson                                                  │
+ * │ Creation date: May 31, 2024                                                 │
+ * │ Contact: contato@codechat.dev                                                │
+ * ├──────────────────────────────────────────────────────────────────────────────┤
+ * │ @copyright © Cleber Wilson 2023. All rights reserved.                        │
+ * │ Licensed under the Apache License, Version 2.0                               │
+ * │                                                                              │
+ * │  @license "https://github.com/code-chat-br/whatsapp-api/blob/main/LICENSE"   │
+ * │                                                                              │
+ * │ You may not use this file except in compliance with the License.             │
+ * │ You may obtain a copy of the License at                                      │
+ * │                                                                              │
+ * │    http://www.apache.org/licenses/LICENSE-2.0                                │
+ * │                                                                              │
+ * │ Unless required by applicable law or agreed to in writing, software          │
+ * │ distributed under the License is distributed on an "AS IS" BASIS,            │
+ * │ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.     │
+ * │                                                                              │
+ * │ See the License for the specific language governing permissions and          │
+ * │ limitations under the License.                                               │
+ * │                                                                              │
+ * │ @type {AuthState}                                                            │
+ * │ @function useMultiFileAuthStateRedisDb                                       │
+ * │ @returns {Promise<AuthState>}                                                │
+ * ├──────────────────────────────────────────────────────────────────────────────┤
+ * │ @important                                                                   │
+ * │ For any future changes to the code in this file, it is recommended to        │
+ * │ contain, together with the modification, the information of the developer    │
+ * │ who changed it and the date of modification.                                 │
+ * └──────────────────────────────────────────────────────────────────────────────┘
+ */
+
+import {
+  AuthenticationCreds,
+  AuthenticationState,
+  BufferJSON,
+  initAuthCreds,
+  proto,
+  SignalDataTypeMap,
+} from '@whiskeysockets/baileys';
+import { isNotEmpty } from 'class-validator';
+
+import { ProviderFiles } from '../api/provider/sessions';
+import { Logger } from '../config/logger.config';
+
+export type AuthState = { state: AuthenticationState; saveCreds: () => Promise<void> };
+
+export class AuthStateProvider {
+  constructor(private readonly providerFiles: ProviderFiles) {}
+
+  private readonly logger = new Logger(AuthStateProvider.name);
+
+  public async authStateProvider(instance: string): Promise<AuthState> {
+    const [, error] = await this.providerFiles.create(instance);
+    if (error) {
+      this.logger.error(['Failed to create folder on file server', error?.message, error?.stack]);
+      return;
+    }
+
+    const writeData = async (data: any, key: string): Promise<any> => {
+      const json = JSON.stringify(data, BufferJSON.replacer);
+      const [response, error] = await this.providerFiles.write(instance, key, {
+        data: json,
+      });
+      if (error) {
+        // this.logger.error(['writeData', error?.message, error?.stack]);
+        return;
+      }
+      return response;
+    };
+
+    const readData = async (key: string): Promise<any> => {
+      const [response, error] = await this.providerFiles.read(instance, key);
+      if (error) {
+        // this.logger.error(['readData', error?.message, error?.stack]);
+        return;
+      }
+      if (isNotEmpty(response?.data)) {
+        return JSON.parse(JSON.stringify(response.data), BufferJSON.reviver);
+      }
+    };
+
+    const removeData = async (key: string) => {
+      const [response, error] = await this.providerFiles.delete(instance, key);
+      if (error) {
+        // this.logger.error(['removeData', error?.message, error?.stack]);
+        return;
+      }
+
+      return response;
+    };
+
+    const creds: AuthenticationCreds = (await readData('creds')) || initAuthCreds();
+
+    return {
+      state: {
+        creds,
+        keys: {
+          get: async (type, ids: string[]) => {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            const data: { [_: string]: SignalDataTypeMap[type] } = {};
+            await Promise.all(
+              ids.map(async (id) => {
+                let value = await readData(`${type}-${id}`);
+                if (type === 'app-state-sync-key' && value) {
+                  value = proto.Message.AppStateSyncKeyData.fromObject(value);
+                }
+
+                data[id] = value;
+              }),
+            );
+
+            return data;
+          },
+          set: async (data: any) => {
+            const tasks: Promise<void>[] = [];
+            for (const category in data) {
+              for (const id in data[category]) {
+                const value = data[category][id];
+                const key = `${category}-${id}`;
+                tasks.push(value ? await writeData(value, key) : await removeData(key));
+              }
+            }
+
+            await Promise.all(tasks);
+          },
+        },
+      },
+      saveCreds: async () => {
+        return await writeData(creds, 'creds');
+      },
+    };
+  }
+}

src/utils/use-multi-file-auth-state-redis-db.ts

@@ -1,4 +1,10 @@
-import { AuthenticationCreds, AuthenticationState, initAuthCreds, proto, SignalDataTypeMap } from 'baileys';
+import {
+  AuthenticationCreds,
+  AuthenticationState,
+  initAuthCreds,
+  proto,
+  SignalDataTypeMap,
+} from '@whiskeysockets/baileys';
 
 import { CacheService } from '../api/services/cache.service';
 import { Logger } from '../config/logger.config';

src/validate/validate.schema.ts

@@ -597,6 +597,33 @@ export const archiveChatSchema: JSONSchema7 = {
   required: ['archive'],
 };
 
+export const markChatUnreadSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    chat: { type: 'string' },
+    lastMessage: {
+      type: 'object',
+      properties: {
+        key: {
+          type: 'object',
+          properties: {
+            id: { type: 'string' },
+            remoteJid: { type: 'string' },
+            fromMe: { type: 'boolean', enum: [true, false] },
+          },
+          required: ['id', 'fromMe', 'remoteJid'],
+          ...isNotEmpty('id', 'remoteJid'),
+        },
+        messageTimestamp: { type: 'integer', minLength: 1 },
+      },
+      required: ['key'],
+      ...isNotEmpty('messageTimestamp'),
+    },
+  },
+  required: ['lastMessage'],
+};
+
 export const deleteMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',