Skip to content

Commit 3960624

Browse files
committed
Merge branch 'release/2.3.0'
2 parents 427c994 + f4fbc4a commit 3960624

File tree

107 files changed

+9274
-9875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+9274
-9875
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
.git
22
*Dockerfile*
33
*docker-compose*
4+
package-lock.json
5+
.env
46
node_modules
57
dist

.env.example

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ SERVER_PORT=8080
33
# Server URL - Set your application url
44
SERVER_URL=http://localhost:8080
55

6+
SSL_CONF_PRIVKEY=/path/to/cert.key
7+
SSL_CONF_FULLCHAIN=/path/to/cert.crt
8+
69
SENTRY_DSN=
710

811
# Cors - * for all or set separate by commas - ex.: 'yourdomain1.com, yourdomain2.com'
@@ -47,6 +50,7 @@ DATABASE_DELETE_MESSAGE=true
4750
RABBITMQ_ENABLED=false
4851
RABBITMQ_URI=amqp://localhost
4952
RABBITMQ_EXCHANGE_NAME=evolution
53+
RABBITMQ_FRAME_MAX=8192
5054
# Global events - By enabling this variable, events from all instances are sent in the same event queue.
5155
RABBITMQ_GLOBAL_ENABLED=false
5256
# Prefix key to queue name
@@ -62,6 +66,7 @@ RABBITMQ_EVENTS_MESSAGES_EDITED=false
6266
RABBITMQ_EVENTS_MESSAGES_UPDATE=false
6367
RABBITMQ_EVENTS_MESSAGES_DELETE=false
6468
RABBITMQ_EVENTS_SEND_MESSAGE=false
69+
RABBITMQ_EVENTS_SEND_MESSAGE_UPDATE=false
6570
RABBITMQ_EVENTS_CONTACTS_SET=false
6671
RABBITMQ_EVENTS_CONTACTS_UPSERT=false
6772
RABBITMQ_EVENTS_CONTACTS_UPDATE=false
@@ -108,6 +113,7 @@ PUSHER_EVENTS_MESSAGES_EDITED=true
108113
PUSHER_EVENTS_MESSAGES_UPDATE=true
109114
PUSHER_EVENTS_MESSAGES_DELETE=true
110115
PUSHER_EVENTS_SEND_MESSAGE=true
116+
PUSHER_EVENTS_SEND_MESSAGE_UPDATE=true
111117
PUSHER_EVENTS_CONTACTS_SET=true
112118
PUSHER_EVENTS_CONTACTS_UPSERT=true
113119
PUSHER_EVENTS_CONTACTS_UPDATE=true
@@ -149,6 +155,7 @@ WEBHOOK_EVENTS_MESSAGES_EDITED=true
149155
WEBHOOK_EVENTS_MESSAGES_UPDATE=true
150156
WEBHOOK_EVENTS_MESSAGES_DELETE=true
151157
WEBHOOK_EVENTS_SEND_MESSAGE=true
158+
WEBHOOK_EVENTS_SEND_MESSAGE_UPDATE=true
152159
WEBHOOK_EVENTS_CONTACTS_SET=true
153160
WEBHOOK_EVENTS_CONTACTS_UPSERT=true
154161
WEBHOOK_EVENTS_CONTACTS_UPDATE=true
@@ -173,14 +180,23 @@ WEBHOOK_EVENTS_TYPEBOT_CHANGE_STATUS=false
173180
WEBHOOK_EVENTS_ERRORS=false
174181
WEBHOOK_EVENTS_ERRORS_WEBHOOK=
175182

183+
WEBHOOK_REQUEST_TIMEOUT_MS=60000
184+
WEBHOOK_RETRY_MAX_ATTEMPTS=10
185+
WEBHOOK_RETRY_INITIAL_DELAY_SECONDS=5
186+
WEBHOOK_RETRY_USE_EXPONENTIAL_BACKOFF=true
187+
WEBHOOK_RETRY_MAX_DELAY_SECONDS=300
188+
WEBHOOK_RETRY_JITTER_FACTOR=0.2
189+
# Comma separated list of HTTP status codes that should not trigger retries
190+
WEBHOOK_RETRY_NON_RETRYABLE_STATUS_CODES=400,401,403,404,422
191+
176192
# Name that will be displayed on smartphone connection
177193
CONFIG_SESSION_PHONE_CLIENT=Evolution API
178194
# Browser Name = Chrome | Firefox | Edge | Opera | Safari
179195
CONFIG_SESSION_PHONE_NAME=Chrome
180196

181197
# Whatsapp Web version for baileys channel
182198
# https://web.whatsapp.com/check-update?version=0&platform=web
183-
CONFIG_SESSION_PHONE_VERSION=2.3000.1015901307
199+
# CONFIG_SESSION_PHONE_VERSION=2.3000.1023204200
184200

185201
# Set qrcode display limit
186202
QRCODE_LIMIT=30
@@ -210,6 +226,12 @@ OPENAI_ENABLED=false
210226
# Dify - Environment variables
211227
DIFY_ENABLED=false
212228

229+
# n8n - Environment variables
230+
N8N_ENABLED=false
231+
232+
# EvoAI - Environment variables
233+
EVOAI_ENABLED=false
234+
213235
# Cache - Environment variables
214236
# Redis Cache enabled
215237
CACHE_REDIS_ENABLED=true
@@ -266,4 +288,4 @@ LANGUAGE=en
266288
# PROXY_PORT=80
267289
# PROXY_PROTOCOL=http
268290
# PROXY_USERNAME=
269-
# PROXY_PASSWORD=
291+
# PROXY_PASSWORD=

.github/workflows/publish_docker_image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: meta
2121
uses: docker/metadata-action@v5
2222
with:
23-
images: atendai/evolution-api
23+
images: evoapicloud/evolution-api
2424
tags: type=semver,pattern=v{{version}}
2525

2626
- name: Set up QEMU

.github/workflows/publish_docker_image_homolog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: meta
2121
uses: docker/metadata-action@v5
2222
with:
23-
images: atendai/evolution-api
23+
images: evoapicloud/evolution-api
2424
tags: homolog
2525

2626
- name: Set up QEMU

.github/workflows/publish_docker_image_latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: meta
2121
uses: docker/metadata-action@v5
2222
with:
23-
images: atendai/evolution-api
23+
images: evoapicloud/evolution-api
2424
tags: latest
2525

2626
- name: Set up QEMU

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
/dist
33
/node_modules
44

5+
.cursor*
6+
57
/Docker/.env
68

79
.vscode

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# 2.3.0 (2025-06-17 09:19)
2+
3+
### Feature
4+
5+
* Add support to get Catalogs and Collections with new routes: '{{baseUrl}}/chat/fetchCatalogs' and '{{baseUrl}}/chat/fetchCollections'
6+
* Add NATS integration support to the event system
7+
* Add message location support meta
8+
* Add S3_SKIP_POLICY env variable to disable setBucketPolicy for incompatible providers
9+
* Add EvoAI integration with models, services, and routes
10+
* Add N8n integration with models, services, and routes
11+
12+
### Fixed
13+
14+
* Shell injection vulnerability
15+
* Update Baileys Version v6.7.18
16+
* Audio send duplicate from chatwoot
17+
* Chatwoot csat creating new conversation in another language
18+
* Refactor SQS controller to correct bug in sqs events by instance
19+
* Adjustin cloud api send audio and video
20+
* Preserve animation in GIF and WebP stickers
21+
* Preventing use conversation from other inbox for the same user
22+
* Ensure full WhatsApp compatibility for audio conversion (libopus, 48kHz, mono)
23+
* Enhance message fetching and processing logic
24+
* Added lid on whatsapp numbers router
25+
* Now if the CONFIG_SESSION_PHONE_VERSION variable is not filled in it automatically searches for the most updated version
26+
27+
### Security
28+
29+
* Change execSync to execFileSync
30+
* Enhance WebSocket authentication and connection handling
31+
132
# 2.2.3 (2025-02-03 11:52)
233

334
### Fixed

Docker/swarm/evolution_api_v2.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.7"
22

33
services:
44
evolution_v2:
5-
image: atendai/evolution-api:v2.1.2
5+
image: atendai/evolution-api:v2.2.3
66
volumes:
77
- evolution_instances:/evolution/instances
88
networks:
@@ -34,6 +34,7 @@ services:
3434
- RABBITMQ_EVENTS_MESSAGES_UPDATE=false
3535
- RABBITMQ_EVENTS_MESSAGES_DELETE=false
3636
- RABBITMQ_EVENTS_SEND_MESSAGE=false
37+
- RABBITMQ_EVENTS_SEND_MESSAGE_UPDATE=false
3738
- RABBITMQ_EVENTS_CONTACTS_SET=false
3839
- RABBITMQ_EVENTS_CONTACTS_UPSERT=false
3940
- RABBITMQ_EVENTS_CONTACTS_UPDATE=false
@@ -71,6 +72,7 @@ services:
7172
- WEBHOOK_EVENTS_MESSAGES_UPDATE=true
7273
- WEBHOOK_EVENTS_MESSAGES_DELETE=true
7374
- WEBHOOK_EVENTS_SEND_MESSAGE=true
75+
- WEBHOOK_EVENTS_SEND_MESSAGE_UPDATE=true
7476
- WEBHOOK_EVENTS_CONTACTS_SET=true
7577
- WEBHOOK_EVENTS_CONTACTS_UPSERT=true
7678
- WEBHOOK_EVENTS_CONTACTS_UPDATE=true
@@ -92,7 +94,7 @@ services:
9294
- WEBHOOK_EVENTS_ERRORS_WEBHOOK=
9395
- CONFIG_SESSION_PHONE_CLIENT=Evolution API V2
9496
- CONFIG_SESSION_PHONE_NAME=Chrome
95-
- CONFIG_SESSION_PHONE_VERSION=2.3000.1015901307
97+
- CONFIG_SESSION_PHONE_VERSION=2.3000.1023204200
9698
- QRCODE_LIMIT=30
9799
- OPENAI_ENABLED=true
98100
- DIFY_ENABLED=true

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
FROM node:20-alpine AS builder
22

33
RUN apk update && \
4-
apk add git ffmpeg wget curl bash openssl
4+
apk add --no-cache git ffmpeg wget curl bash openssl
55

6-
LABEL version="2.2.3" description="Api to control whatsapp features through http requests."
6+
LABEL version="2.3.0" description="Api to control whatsapp features through http requests."
77
LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
8-
LABEL contact="contato@atendai.com"
8+
LABEL contact="contato@evolution-api.com"
99

1010
WORKDIR /evolution
1111

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ a. LOGO and copyright information: In the process of using Evolution API's front
88

99
b. Usage Notification Requirement: If Evolution API is used as part of any project, including closed-source systems (e.g., proprietary software), the user is required to display a clear notification within the system that Evolution API is being utilized. This notification should be visible to system administrators and accessible from the system's documentation or settings page. Failure to comply with this requirement may result in the necessity for a commercial license, as determined by the producer.
1010

11-
Please contact contato@atendai.com to inquire about licensing matters.
11+
Please contact contato@evolution-api.com to inquire about licensing matters.
1212

1313
2. As a contributor, you should agree that:
1414

0 commit comments

Comments
 (0)