Skip to content

Commit a5a46dc

Browse files
Merge branch 'develop' into main
2 parents e134348 + 53cd7d5 commit a5a46dc

File tree

14 files changed

+390
-139
lines changed

14 files changed

+390
-139
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ body:
5959
value: |
6060
- OS: [e.g. Ubuntu 20.04, Windows 10, macOS 12.0]
6161
- Node.js version: [e.g. 18.17.0]
62-
- Evolution API version: [e.g. 2.3.4]
62+
- Evolution API version: [e.g. 2.3.5]
6363
- Database: [e.g. PostgreSQL 14, MySQL 8.0]
6464
- Connection type: [e.g. Baileys, WhatsApp Business API]
6565
validations:

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# 2.3.5 (develop)
2+
3+
### Fixed
4+
5+
* **Kafka Migration**: Fixed PostgreSQL migration error for Kafka integration
6+
- Corrected table reference from `"public"."Instance"` to `"Instance"` in foreign key constraint
7+
- Fixed `ERROR: relation "public.Instance" does not exist` issue in migration `20250918182355_add_kafka_integration`
8+
- Aligned table naming convention with other Evolution API migrations for consistency
9+
- Resolved database migration failure that prevented Kafka integration setup
10+
* **Update Baileys Version**: v7.0.0-rc.4
11+
* Refactor connection with PostgreSQL and improve message handling
12+
13+
14+
###
15+
116
# 2.3.4 (2025-09-23)
217

318
### Features

Docker/kafka/docker-compose.yaml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
version: '3.3'
2+
3+
services:
4+
zookeeper:
5+
container_name: zookeeper
6+
image: confluentinc/cp-zookeeper:7.5.0
7+
environment:
8+
- ZOOKEEPER_CLIENT_PORT=2181
9+
- ZOOKEEPER_TICK_TIME=2000
10+
- ZOOKEEPER_SYNC_LIMIT=2
11+
volumes:
12+
- zookeeper_data:/var/lib/zookeeper/
13+
ports:
14+
- 2181:2181
15+
16+
kafka:
17+
container_name: kafka
18+
image: confluentinc/cp-kafka:7.5.0
19+
depends_on:
20+
- zookeeper
21+
environment:
22+
- KAFKA_BROKER_ID=1
23+
- KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181
24+
- KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,OUTSIDE:PLAINTEXT
25+
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092,OUTSIDE://host.docker.internal:9094
26+
- KAFKA_INTER_BROKER_LISTENER_NAME=PLAINTEXT
27+
- KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
28+
- KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1
29+
- KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
30+
- KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS=0
31+
- KAFKA_AUTO_CREATE_TOPICS_ENABLE=true
32+
- KAFKA_LOG_RETENTION_HOURS=168
33+
- KAFKA_LOG_SEGMENT_BYTES=1073741824
34+
- KAFKA_LOG_RETENTION_CHECK_INTERVAL_MS=300000
35+
- KAFKA_COMPRESSION_TYPE=gzip
36+
ports:
37+
- 29092:29092
38+
- 9092:9092
39+
- 9094:9094
40+
volumes:
41+
- kafka_data:/var/lib/kafka/data
42+
43+
volumes:
44+
zookeeper_data:
45+
kafka_data:
46+
47+
48+
networks:
49+
evolution-net:
50+
name: evolution-net
51+
driver: bridge

Docker/swarm/evolution_api_v2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.7"
22

33
services:
44
evolution_v2:
5-
image: evoapicloud/evolution-api:v2.3.1
5+
image: evoapicloud/evolution-api:v2.3.5
66
volumes:
77
- evolution_instances:/evolution/instances
88
networks:

docker-compose.dev.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ services:
1515
expose:
1616
- 8080
1717

18+
frontend:
19+
container_name: evolution_frontend
20+
image: evolution/manager:local
21+
build: ./evolution-manager-v2
22+
restart: always
23+
ports:
24+
- "3000:80"
25+
networks:
26+
- evolution-net
27+
1828
volumes:
1929
evolution_instances:
2030

docker-compose.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ services:
2020
expose:
2121
- "8080"
2222

23+
frontend:
24+
container_name: evolution_frontend
25+
image: evoapicloud/evolution-manager:latest
26+
restart: always
27+
ports:
28+
- "3000:80"
29+
networks:
30+
- evolution-net
31+
2332
redis:
2433
container_name: evolution_redis
2534
image: redis:latest

package-lock.json

Lines changed: 35 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "evolution-api",
3-
"version": "2.3.4",
3+
"version": "2.3.5",
44
"description": "Rest api for communication with WhatsApp",
55
"main": "./dist/main.js",
66
"type": "commonjs",
@@ -77,7 +77,7 @@
7777
"amqplib": "^0.10.5",
7878
"audio-decode": "^2.2.3",
7979
"axios": "^1.7.9",
80-
"baileys": "^7.0.0-rc.3",
80+
"baileys": "^7.0.0-rc.5",
8181
"class-validator": "^0.14.1",
8282
"compression": "^1.7.5",
8383
"cors": "^2.8.5",

prisma/postgresql-migrations/20250918182355_add_kafka_integration/migration.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-- CreateTable
2-
CREATE TABLE "public"."Kafka" (
2+
CREATE TABLE "Kafka" (
33
"id" TEXT NOT NULL,
44
"enabled" BOOLEAN NOT NULL DEFAULT false,
55
"events" JSONB NOT NULL,
@@ -11,7 +11,7 @@ CREATE TABLE "public"."Kafka" (
1111
);
1212

1313
-- CreateIndex
14-
CREATE UNIQUE INDEX "Kafka_instanceId_key" ON "public"."Kafka"("instanceId");
14+
CREATE UNIQUE INDEX "Kafka_instanceId_key" ON "Kafka"("instanceId");
1515

1616
-- AddForeignKey
17-
ALTER TABLE "public"."Kafka" ADD CONSTRAINT "Kafka_instanceId_fkey" FOREIGN KEY ("instanceId") REFERENCES "public"."Instance"("id") ON DELETE CASCADE ON UPDATE CASCADE;
17+
ALTER TABLE "Kafka" ADD CONSTRAINT "Kafka_instanceId_fkey" FOREIGN KEY ("instanceId") REFERENCES "Instance"("id") ON DELETE CASCADE ON UPDATE CASCADE;

0 commit comments

Comments
 (0)