Merge branch 'release/1.7.0'

Author: DavidsonGomes

.github/workflows/publish_docker_image.yml

@@ -0,0 +1,64 @@
+name: Build Docker image
+
+on:
+  push:
+    tags: ['v*']
+
+jobs:
+  build-amd:
+    runs-on: ubuntu-latest
+    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 AMD image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          labels: ${{ steps.image-meta.outputs.labels }}
+          platforms: linux/amd64
+          push: true
+
+  build-arm:
+    runs-on: buildjet-4vcpu-ubuntu-2204-arm
+    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

.gitignore

@@ -4,6 +4,8 @@
 
 /Docker/.env
 
+.vscode
+
 # Logs
 logs/**.json
 *.log
@@ -44,4 +46,5 @@ docker-compose.yaml
 /temp/*
 
 .DS_Store
-*.DS_Store
+*.DS_Store
+.tool-versions

.vscode/settings.json

@@ -9,5 +9,8 @@
     "source.fixAll": "explicit"
   },
   "prisma-smart-formatter.typescript.defaultFormatter": "esbenp.prettier-vscode",
-  "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma"
+  "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma",
+  "i18n-ally.localesPaths": [
+    "store/messages"
+  ]
 }

CHANGELOG.md

@@ -1,3 +1,46 @@
+# 1.7.0 (2024-03-11 18:23)
+
+### Feature
+
+* Added update message endpoint
+* Add translate capabilities to QRMessages in CW
+* Join in Group by Invite Code
+* Read messages from whatsapp in chatwoot
+* Add support to use use redis in cacheservice
+* Add support for labels
+* Command to clearcache from chatwoot inbox
+* Whatsapp Cloud API Oficial
+
+### Fixed
+
+* Proxy configuration improvements
+* Correction in sending lists
+* Adjust in webhook_base64
+* Correction in typebot text formatting
+* Correction in chatwoot text formatting and render list message
+* Only use a axios request to get file mimetype if necessary
+* When possible use the original file extension
+* When receiving a file from whatsapp, use the original filename in chatwoot if possible
+* Remove message ids cache in chatwoot to use chatwoot's api itself
+* Adjusts the quoted message, now has contextInfo in the message Raw
+* Collecting responses with text or numbers in Typebot
+* Added sendList endpoint to swagger documentation
+* Implemented a function to synchronize message deletions on WhatsApp, automatically reflecting in Chatwoot.
+* Improvement on numbers validation
+* Fix polls in message sending
+* Sending status message
+* Message 'connection successfully' spamming
+* Invalidate the conversation cache if reopen_conversation is false and the conversation was resolved
+* Fix looping when deleting a message in chatwoot
+* When receiving a file from whatsapp, use the original filename in chatwoot if possible
+* Correction in the sendList Function
+* Implement contact upsert in messaging-history.set
+* Improve proxy error handling
+* Refactor fetching participants for group in WhatsApp service
+* Fixed problem where the typebot final keyword did not work
+* Typebot's wait now pauses the flow and composing is defined by the delay_message parameter in set typebot
+* Composing over 20s now loops until finished
+
 # 1.6.1 (2023-12-22 11:43)
 
 ### Fixed

Docker/.env.example

@@ -16,6 +16,7 @@ LOG_BAILEYS=error
 # Default time: 5 minutes
 # If you don't even want an expiration, enter the value false
 DEL_INSTANCE=false
+DEL_TEMP_INSTANCES=true # Delete instances with status closed on start
 
 # Temporary data storage
 STORE_MESSAGES=true
@@ -47,10 +48,17 @@ REDIS_URI=redis://redis:6379
 REDIS_PREFIX_KEY=evdocker
 
 RABBITMQ_ENABLED=false
+RABBITMQ_RABBITMQ_MODE=global
+RABBITMQ_EXCHANGE_NAME=evolution_exchange
 RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
 
 WEBSOCKET_ENABLED=false
 
+WA_BUSINESS_TOKEN_WEBHOOK=evolution
+WA_BUSINESS_URL=https://graph.facebook.com
+WA_BUSINESS_VERSION=v18.0
+WA_BUSINESS_LANGUAGE=pt_BR
+
 SQS_ENABLED=false
 SQS_ACCESS_KEY_ID=
 SQS_SECRET_ACCESS_KEY=
@@ -84,6 +92,8 @@ WEBHOOK_EVENTS_GROUPS_UPSERT=true
 WEBHOOK_EVENTS_GROUPS_UPDATE=true
 WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+WEBHOOK_EVENTS_LABELS_EDIT=true
+WEBHOOK_EVENTS_LABELS_ASSOCIATION=true
 WEBHOOK_EVENTS_CALL=true
 # This event fires every time a new token is requested via the refresh route
 WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
@@ -109,6 +119,13 @@ QRCODE_COLOR=#198754
 TYPEBOT_API_VERSION=latest
 TYPEBOT_KEEP_OPEN=false
 
+#Chatwoot
+# If you leave this option as false, when deleting the message for everyone on WhatsApp, it will not be deleted on Chatwoot.
+CHATWOOT_MESSAGE_DELETE=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_PLACEHOLDER_MEDIA_MESSAGE=true
+
 # Defines an authentication type for the api
 # We recommend using the apikey because it will allow you to use a custom token,
 # if you use jwt, a random token will be generated and may be expired and you will have to generate a new token

Docker/docker-compose.yaml

@@ -4,7 +4,7 @@ services:
 
   api:
     container_name: evolution_api
-    image: davidsongomes/evolution-api
+    image: atendai/evolution-api
     restart: always
     ports:
       - 8080:8080
@@ -19,4 +19,4 @@ services:
 
 volumes:
   evolution_instances:
-  evolution_store:
+  evolution_store:

Docker/evolution-api-all-services/.env.example

@@ -16,6 +16,7 @@ LOG_BAILEYS=error
 # Default time: 5 minutes
 # If you don't even want an expiration, enter the value false
 DEL_INSTANCE=false
+DEL_TEMP_INSTANCES=true # Delete instances with status closed on start
 
 # Temporary data storage
 STORE_MESSAGES=true
@@ -73,6 +74,8 @@ WEBHOOK_EVENTS_GROUPS_UPSERT=true
 WEBHOOK_EVENTS_GROUPS_UPDATE=true
 WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+WEBHOOK_EVENTS_LABELS_EDIT=true
+WEBHOOK_EVENTS_LABELS_ASSOCIATION=true
 # This event fires every time a new token is requested via the refresh route
 WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 

Docker/evolution-api-all-services/docker-compose.yaml

@@ -62,7 +62,7 @@ services:
 
   api:
     container_name: evolution_api
-    image: davidsongomes/evolution-api
+    image: atendai/evolution-api
     restart: always
     depends_on:
       - mongodb
@@ -88,4 +88,4 @@ volumes:
 networks:
   evolution-net:
     external: true
-  
+  

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20.7.0-alpine AS builder
 
-LABEL version="1.6.1" description="Api to control whatsapp features through http requests." 
+LABEL version="1.7.0" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="contato@agenciadgcode.com"
 
@@ -35,6 +35,7 @@ ENV LOG_COLOR=true
 ENV LOG_BAILEYS=error
 
 ENV DEL_INSTANCE=false
+ENV DEL_TEMP_INSTANCES=true
 
 ENV STORE_MESSAGES=true
 ENV STORE_MESSAGE_UP=true
@@ -62,10 +63,17 @@ ENV REDIS_URI=redis://redis:6379
 ENV REDIS_PREFIX_KEY=evolution
 
 ENV RABBITMQ_ENABLED=false
+ENV RABBITMQ_MODE=global
+ENV RABBITMQ_EXCHANGE_NAME=evolution_exchange
 ENV RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
 
 ENV WEBSOCKET_ENABLED=false
 
+ENV WA_BUSINESS_TOKEN_WEBHOOK=evolution
+ENV WA_BUSINESS_URL=https://graph.facebook.com
+ENV WA_BUSINESS_VERSION=v18.0
+ENV WA_BUSINESS_LANGUAGE=pt_BR
+
 ENV SQS_ENABLED=false
 ENV SQS_ACCESS_KEY_ID=
 ENV SQS_SECRET_ACCESS_KEY=
@@ -98,6 +106,8 @@ ENV WEBHOOK_EVENTS_GROUPS_UPSERT=true
 ENV WEBHOOK_EVENTS_GROUPS_UPDATE=true
 ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+ENV WEBHOOK_EVENTS_LABELS_EDIT=true
+ENV WEBHOOK_EVENTS_LABELS_ASSOCIATION=true
 ENV WEBHOOK_EVENTS_CALL=true
 
 ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -46,11 +46,11 @@
     "@figuro/chatwoot-sdk": "^1.1.16",
     "@hapi/boom": "^10.0.1",
     "@sentry/node": "^7.59.2",
-    "@whiskeysockets/baileys": "github:PurpShell/Baileys#combined",
+    "@whiskeysockets/baileys": "6.6.0",
     "amqplib": "^0.10.3",
     "aws-sdk": "^2.1499.0",
-    "axios": "^1.3.5",
-    "class-validator": "^0.13.2",
+    "axios": "^1.6.5",
+    "class-validator": "^0.14.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
@@ -60,28 +60,33 @@
     "exiftool-vendored": "^22.0.0",
     "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
+    "form-data": "^4.0.0",
     "hbs": "^4.2.0",
+    "https-proxy-agent": "^7.0.2",
+    "i18next": "^23.7.19",
     "jimp": "^0.16.13",
     "join": "^3.0.0",
     "js-yaml": "^4.1.0",
     "jsonschema": "^1.4.1",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.2",
     "libphonenumber-js": "^1.10.39",
     "link-preview-js": "^3.0.4",
     "mongoose": "^6.10.5",
     "node-cache": "^5.1.2",
     "node-mime-types": "^1.1.0",
     "node-windows": "^1.0.0-beta.8",
+    "parse-bmfont-xml": "^1.1.4",
+    "pg": "^8.11.3",
     "pino": "^8.11.0",
-    "proxy-agent": "^6.3.0",
     "qrcode": "^1.5.1",
     "qrcode-terminal": "^0.12.0",
     "redis": "^4.6.5",
-    "sharp": "^0.30.7",
+    "sharp": "^0.32.2",
     "socket.io": "^4.7.1",
     "socks-proxy-agent": "^8.0.1",
     "swagger-ui-express": "^5.0.0",
     "uuid": "^9.0.0",
+    "xml2js": "^0.6.2",
     "yamljs": "^0.3.0"
   },
   "devDependencies": {