Merge branch 'release/1.1.1'

Author: dgcode-tec

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.1.1 (2023-06-28 10:27)
+
+### Features
+
+* Added group invitation sending
+* Added webhook configuration per event in the individual instance registration
+
+### Fixed
+
+* Adjust dockerfile variables
+
 # 1.1.0 (2023-06-21 11:17)
 
 ### Features

Docker/.env

@@ -0,0 +1,27 @@
+version: '3.3'
+
+networks:
+  evolution-net:
+    driver: bridge
+
+services:
+  mongodb:
+    container_name: mongodb
+    image: mongo
+    restart: always
+    volumes:
+      - evolution_mongodb_data:/data/db
+      - evolution_mongodb_configdb:/data/configdb
+    ports:
+      - 27017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: root
+    networks:
+      - evolution-net
+    expose:
+      - 27017
+
+volumes:
+  evolution_mongodb_data:
+  evolution_mongodb_configdb:

Docker/mongodb/docker-compose.yaml

@@ -0,0 +1,27 @@
+version: '3.3'
+
+networks:
+  evolution-net:
+    driver: bridge
+
+services:
+  redis:
+    image: redis:latest
+    command: >
+      redis-server
+      --port 6379
+      --appendonly yes
+      --save 900 1
+      --save 300 10
+      --save 60 10000
+      --appendfsync everysec
+    volumes:
+      - evolution_redis:/data
+    container_name: redis
+    ports:
+      - 6379:6379
+    networks:
+      - evolution-net
+
+volumes:
+  evolution_redis:

Docker/redis/docker-compose.yaml

@@ -49,7 +49,6 @@ ENV WEBHOOK_GLOBAL_URL=$WEBHOOK_GLOBAL_URL
 ENV WEBHOOK_GLOBAL_ENABLED=$WEBHOOK_GLOBAL_ENABLED
 ENV WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=$WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS
 
-ENV WEBHOOK_EVENTS_STATUS_INSTANCE=$WEBHOOK_EVENTS_STATUS_INSTANCE
 ENV WEBHOOK_EVENTS_APPLICATION_STARTUP=$WEBHOOK_EVENTS_APPLICATION_STARTUP
 ENV WEBHOOK_EVENTS_QRCODE_UPDATED=$WEBHOOK_EVENTS_QRCODE_UPDATED
 ENV WEBHOOK_EVENTS_MESSAGES_SET=$WEBHOOK_EVENTS_MESSAGES_SET
@@ -71,7 +70,7 @@ ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=$WEBHOOK_EVENTS_GROUP_PARTICIPANTS_
 ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=$WEBHOOK_EVENTS_NEW_JWT_TOKEN
 
 ENV CONFIG_SESSION_PHONE_CLIENT=$CONFIG_SESSION_PHONE_CLIENT
-ENV CONFIG_SESSION_PHONE_NAME="Chrome"
+ENV CONFIG_SESSION_PHONE_NAME=$CONFIG_SESSION_PHONE_NAME
 
 ENV QRCODE_LIMIT=$QRCODE_LIMIT
 
@@ -86,7 +85,6 @@ ENV AUTHENTICATION_JWT_SECRET="L=0YWt]b2w[WF>#>:&E`"
 ENV AUTHENTICATION_INSTANCE_NAME=$AUTHENTICATION_INSTANCE_NAME
 ENV AUTHENTICATION_INSTANCE_WEBHOOK_URL=$AUTHENTICATION_INSTANCE_WEBHOOK_URL
 ENV AUTHENTICATION_INSTANCE_MODE=$AUTHENTICATION_INSTANCE_MODE
-ENV AUTHENTICATION_INSTANCE_WEBHOOK_BY_EVENTS=$AUTHENTICATION_INSTANCE_WEBHOOK_BY_EVENTS
 
 RUN npm install
 

Dockerfile

@@ -13,9 +13,6 @@ services:
     volumes:
       - evolution_instances:/evolution/instances
       - evolution_store:/evolution/store
-    depends_on:
-      - mongodb
-      - redis
     environment:
       # Determine how long the instance should be deleted from memory in case of no connection.
       # Default time: 5 minutes
@@ -32,7 +29,7 @@ services:
       - CLEAN_STORE_CONTACTS=true
       - CLEAN_STORE_CHATS=true
       # Permanent data storage
-      - DATABASE_ENABLED=true
+      - DATABASE_ENABLED=false
       - DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true
       - DATABASE_CONNECTION_DB_PREFIX_NAME=evolution
       # Choose the data you want to save in the application's database or store
@@ -42,23 +39,22 @@ services:
       - DATABASE_SAVE_MESSAGE_UPDATE=true
       - DATABASE_SAVE_DATA_CONTACTS=true
       - DATABASE_SAVE_DATA_CHATS=true
-      - REDIS_ENABLED=true
-      - REDIS_URI=redis://redis:6379
+      - REDIS_ENABLED=false
+      - REDIS_URI=redis://redis:6379/1
       - REDIS_PREFIX_KEY=evolution
       # Webhook Settings
       # Define a global webhook that will listen for enabled events from all instances
-      - WEBHOOK_GLOBAL_URL=url
+      - WEBHOOK_GLOBAL_URL=<url>
       - WEBHOOK_GLOBAL_ENABLED=false
       # With this option activated, you work with a url per webhook event, respecting the global url and the name of each event
       - WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=false
       # Automatically maps webhook paths
       # Set the events you want to hear 
-      - WEBHOOK_EVENTS_STATUS_INSTANCE=true
       - WEBHOOK_EVENTS_APPLICATION_STARTUP=false
       - WEBHOOK_EVENTS_QRCODE_UPDATED=true
       - WEBHOOK_EVENTS_MESSAGES_SET=true
-      - WEBHOOK_EVENTS_MESSAGES_UPDATE=true
       - WEBHOOK_EVENTS_MESSAGES_UPSERT=true
+      - WEBHOOK_EVENTS_MESSAGES_UPDATE=true
       - WEBHOOK_EVENTS_SEND_MESSAGE=true
       - WEBHOOK_EVENTS_CONTACTS_SET=true
       - WEBHOOK_EVENTS_CONTACTS_UPSERT=true
@@ -67,14 +63,16 @@ services:
       - WEBHOOK_EVENTS_CHATS_SET=true
       - WEBHOOK_EVENTS_CHATS_UPSERT=true
       - WEBHOOK_EVENTS_CHATS_UPDATE=true
-      - WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+      - WEBHOOK_EVENTS_CHATS_DELETE=true
       - WEBHOOK_EVENTS_GROUPS_UPSERT=true
       - WEBHOOK_EVENTS_GROUPS_UPDATE=true
       - WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+      - WEBHOOK_EVENTS_CONNECTION_UPDATE=true
       # This event fires every time a new token is requested via the refresh route
       - WEBHOOK_EVENTS_NEW_JWT_TOKEN=true
       # Name that will be displayed on smartphone connection
-      - CONFIG_SESSION_PHONE_CLIENT="Evolution API"
+      - CONFIG_SESSION_PHONE_CLIENT=Evolution API
+      - CONFIG_SESSION_PHONE_NAME=chrome # chrome | firefox | edge | opera | safari
       # Set qrcode display limit
       - QRCODE_LIMIT=30
       # Defines an authentication type for the api
@@ -88,56 +86,16 @@ services:
       - AUTHENTICATION_JWT_EXPIRIN_IN=0 # seconds - 3600s === 1h | zero (0) - never expires
       # Set the instance name and webhook url to create an instance in init the application
       # With this option activated, you work with a url per webhook event, respecting the local url and the name of each event
-      - AUTHENTICATION_INSTANCE_WEBHOOK_BY_EVENTS=false
       - AUTHENTICATION_INSTANCE_MODE=server # container or server
       # if you are using container mode, set the container name and the webhook url to default instance
       - AUTHENTICATION_INSTANCE_NAME=evolution
-      - AUTHENTICATION_INSTANCE_WEBHOOK_URL=url
+      - AUTHENTICATION_INSTANCE_WEBHOOK_URL=<url>
     command: ['node', './dist/src/main.js']
     networks:
       - evolution-net
     expose:
       - 8080
 
-  mongodb:
-    container_name: mongodb
-    image: mongo
-    restart: always
-    volumes:
-      - evolution_mongodb_data:/data/db
-      - evolution_mongodb_configdb:/data/configdb
-    ports:
-      - 27017:27017
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: root
-    networks:
-      - evolution-net
-    expose:
-      - 27017
-
-  redis:
-    image: redis:latest
-    command: >
-      redis-server
-      --port 6379
-      --appendonly yes
-      --save 900 1
-      --save 300 10
-      --save 60 10000
-      --appendfsync everysec
-    volumes:
-      - evolution_redis:/data
-    container_name: redis
-    ports:
-      - 6379:6379
-    networks:
-      - evolution-net
-
-
 volumes:
   evolution_instances:
-  evolution_store:
-  evolution_mongodb_data:
-  evolution_mongodb_configdb:
-  evolution_redis:
+  evolution_store:

docker-compose.yaml

@@ -8,10 +8,12 @@ then
   docker network create -d bridge ${NET}
 fi
 
-sudo mkdir -p ./docker-data/instances
-sudo mkdir -p ./docker-data/mongodb
-sudo mkdir -p ./docker-data/mongodb/data
-sudo mkdir -p ./docker-data/mongodb/configdb
+# sudo mkdir -p ./docker-data/instances
+# sudo mkdir -p ./docker-data/mongodb
+# sudo mkdir -p ./docker-data/mongodb/data
+# sudo mkdir -p ./docker-data/mongodb/configdb
+# sudo mkdir -p ./docker-data/redis
+# sudo mkdir -p ./docker-data/redis/data
 
 docker build -t ${IMAGE} .
 

docker.sh

@@ -87,7 +87,6 @@ export type Instance = {
   NAME: string;
   WEBHOOK_URL: string;
   MODE: string;
-  WEBHOOK_BY_EVENTS: boolean;
 };
 export type Auth = {
   API_KEY: ApiKey;
@@ -263,8 +262,6 @@ export class ConfigService {
           NAME: process.env.AUTHENTICATION_INSTANCE_NAME,
           WEBHOOK_URL: process.env.AUTHENTICATION_INSTANCE_WEBHOOK_URL,
           MODE: process.env.AUTHENTICATION_INSTANCE_MODE,
-          WEBHOOK_BY_EVENTS:
-            process.env.AUTHENTICATION_INSTANCE_WEBHOOK_BY_EVENTS === 'true',
         },
       },
     };