Skip to content

Commit d98fa52

Browse files
DavidsonGomesDavidsonGomes
authored
Merge branch 'develop' into feat/add-async-lock
2 parents 05886ec + e321609 commit d98fa52

File tree

32 files changed

+3491
-2176
lines changed

32 files changed

+3491
-2176
lines changed

‎.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.git
22
*Dockerfile*
33
*docker-compose*
4-
package-lock.json
54
.env
65
node_modules
76
dist

‎.env.example

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ EVENT_EMITTER_MAX_LISTENERS=50
2727
# If you don't even want an expiration, enter the value false
2828
DEL_INSTANCE=false
2929

30-
# Provider: postgresql | mysql
30+
# Provider: postgresql | mysql | psql_bouncer
3131
DATABASE_PROVIDER=postgresql
32-
DATABASE_CONNECTION_URI='postgresql://user:pass@postgres:5432/evolution?schema=public'
32+
DATABASE_CONNECTION_URI='postgresql://user:pass@postgres:5432/evolution_db?schema=evolution_api'
3333
# Client name for the database connection
3434
# It is used to separate an API installation from another that uses the same database.
3535
DATABASE_CONNECTION_CLIENT_NAME=evolution_exchange
3636

37+
# Bouncer connection: used only when the database provider is set to 'psql_bouncer'.
38+
# Defines the PostgreSQL URL with pgbouncer enabled (pgbouncer=true).
39+
# DATABASE_BOUNCER_CONNECTION_URI=postgresql://user:pass@pgbouncer:5432/evolution_db?pgbouncer=true&schema=evolution_api
40+
3741
# Choose the data you want to save in the application's database
3842
DATABASE_SAVE_DATA_INSTANCE=true
3943
DATABASE_SAVE_DATA_NEW_MESSAGE=true
@@ -196,7 +200,7 @@ CONFIG_SESSION_PHONE_NAME=Chrome
196200

197201
# Whatsapp Web version for baileys channel
198202
# https://web.whatsapp.com/check-update?version=0&platform=web
199-
# CONFIG_SESSION_PHONE_VERSION=2.3000.1023204200
203+
200204

201205
# Set qrcode display limit
202206
QRCODE_LIMIT=30

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 2.3.1 (develop)
2+
3+
### Fixed
4+
5+
* Update Baileys Version
6+
* Update Dockerhub Repository and Delete Config Session Variable
7+
* Fixed sending variables in typebot
8+
* Add unreadMessages in the response
9+
* Phone number as message ID for Evo AI
10+
* Fix upload to s3 when media message
11+
112
# 2.3.0 (2025-06-17 09:19)
213

314
### Feature

‎Docker/scripts/deploy_database.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ "$DOCKER_ENV" != "true" ]; then
66
export_env_vars
77
fi
88

9-
if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then
9+
if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" || "$DATABASE_PROVIDER" == "psql_bouncer" ]]; then
1010
export DATABASE_URL
1111
echo "Deploying migrations for $DATABASE_PROVIDER"
1212
echo "Database URL: $DATABASE_URL"

‎Docker/scripts/generate_database.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ "$DOCKER_ENV" != "true" ]; then
66
export_env_vars
77
fi
88

9-
if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]; then
9+
if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" || "$DATABASE_PROVIDER" == "psql_bouncer" ]]; then
1010
export DATABASE_URL
1111
echo "Generating database for $DATABASE_PROVIDER"
1212
echo "Database URL: $DATABASE_URL"
@@ -20,4 +20,4 @@ if [[ "$DATABASE_PROVIDER" == "postgresql" || "$DATABASE_PROVIDER" == "mysql" ]]
2020
else
2121
echo "Error: Database provider $DATABASE_PROVIDER invalid."
2222
exit 1
23-
fi
23+
fi

‎Docker/swarm/evolution_api_v2.yaml

Lines changed: 2 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.2.3
5+
image: evoapicloud/evolution-api:v2.3.1
66
volumes:
77
- evolution_instances:/evolution/instances
88
networks:
@@ -94,7 +94,7 @@ services:
9494
- WEBHOOK_EVENTS_ERRORS_WEBHOOK=
9595
- CONFIG_SESSION_PHONE_CLIENT=Evolution API V2
9696
- CONFIG_SESSION_PHONE_NAME=Chrome
97-
- CONFIG_SESSION_PHONE_VERSION=2.3000.1023204200
97+
#- CONFIG_SESSION_PHONE_VERSION=2.3000.1023204200
9898
- QRCODE_LIMIT=30
9999
- OPENAI_ENABLED=true
100100
- DIFY_ENABLED=true

‎Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@ FROM node:20-alpine AS builder
33
RUN apk update && \
44
apk add --no-cache git ffmpeg wget curl bash openssl
55

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

1010
WORKDIR /evolution
1111

12-
COPY ./package.json ./tsconfig.json ./
12+
COPY ./package*.json ./
13+
COPY ./tsconfig.json ./
14+
COPY ./tsup.config.ts ./
1315

14-
RUN npm install
16+
RUN npm ci --silent
1517

1618
COPY ./src ./src
1719
COPY ./public ./public
1820
COPY ./prisma ./prisma
1921
COPY ./manager ./manager
2022
COPY ./.env.example ./.env
2123
COPY ./runWithProvider.js ./
22-
COPY ./tsup.config.ts ./
2324

2425
COPY ./Docker ./Docker
2526

@@ -35,6 +36,7 @@ RUN apk update && \
3536
apk add tzdata ffmpeg bash openssl
3637

3738
ENV TZ=America/Sao_Paulo
39+
ENV DOCKER_ENV=true
3840

3941
WORKDIR /evolution
4042

@@ -55,4 +57,4 @@ ENV DOCKER_ENV=true
5557

5658
EXPOSE 8080
5759

58-
ENTRYPOINT ["/bin/bash", "-c", ". ./Docker/scripts/deploy_database.sh && npm run start:prod" ]
60+
ENTRYPOINT ["/bin/bash", "-c", ". ./Docker/scripts/deploy_database.sh && npm run start:prod" ]

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ Please contact contato@evolution-api.com to inquire about licensing matters.
117117

118118
Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
119119

120-
© 2024 Evolution API
120+
© 2025 Evolution API

‎docker-compose.yaml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
services:
2+
23
api:
34
container_name: evolution_api
45
image: evoapicloud/evolution-api:latest
@@ -34,19 +35,41 @@ services:
3435
image: postgres:15
3536
networks:
3637
- evolution-net
37-
command: ["postgres", "-c", "max_connections=1000", "-c", "listen_addresses=*"]
38+
command: [
39+
"postgres",
40+
"-c", "max_connections=200",
41+
"-c", "listen_addresses=*",
42+
"-c", "shared_buffers=256MB",
43+
"-c", "effective_cache_size=1GB",
44+
"-c", "work_mem=4MB"
45+
]
3846
restart: always
3947
ports:
4048
- 5432:5432
4149
environment:
4250
- POSTGRES_USER=user
4351
- POSTGRES_PASSWORD=pass
44-
- POSTGRES_DB=evolution
52+
- POSTGRES_DB=evolution_db
4553
- POSTGRES_HOST_AUTH_METHOD=trust
4654
volumes:
47-
- postgres_data:/var/lib/postgresql/data
48-
expose:
49-
- 5432
55+
- postgres_data:/var/lib/postgresql/data
56+
57+
# pgbouncer:
58+
# image: edoburu/pgbouncer:latest
59+
# environment:
60+
# DB_HOST: postgres
61+
# DB_USER: user
62+
# DB_PASSWORD: pass
63+
# POOL_MODE: transaction
64+
# AUTH_TYPE: trust
65+
# MAX_CLIENT_CONN: 1000
66+
# DEFAULT_POOL_SIZE: 25
67+
# depends_on:
68+
# - postgres
69+
# ports:
70+
# - "6543:5432"
71+
# networks:
72+
# - evolution-net
5073

5174
volumes:
5275
evolution_instances:

0 commit comments

Comments
 (0)