Merge branch 'release/1.1.5'

* Route to send status broadcast
* Added verbose logs
* Insert allContacts in payload of endpoint sendStatus

* Adjusted set in webhook to go empty when enabled false
* Adjust in store files
* Fixed the problem when do not save contacts when receive messages
* Changed owner of the jid for instanceName
* Create .env for installation in docker

.gitignore

@@ -2,6 +2,8 @@
 /dist
 /node_modules
 
+/Docker/.env
+
 # Logs
 logs/**.json
 *.log
@@ -11,8 +13,8 @@ yarn-debug.log*
 yarn-error.log*
 lerna-debug.log*
 
-/store/*
 /docker-compose-data
+/docker-data
 
 # Package
 /yarn.lock
@@ -33,3 +35,6 @@ lerna-debug.log*
 !/instances/.gitkeep
 /test/
 /src/env.yml
+/store
+
+/temp/*

CHANGELOG.md

@@ -1,3 +1,67 @@
+# 1.1.5 (2023-07-12 07:17)
+
+### Fixed
+
+* Adjusts in temp folder
+* Return with event send_message
+
+# 1.1.4 (2023-07-08 11:01)
+
+### Features
+
+* Route to send status broadcast
+* Added verbose logs
+* Insert allContacts in payload of endpoint sendStatus
+
+### Fixed
+
+* Adjusted set in webhook to go empty when enabled false
+* Adjust in store files
+* Fixed the problem when do not save contacts when receive messages
+* Changed owner of the jid for instanceName
+* Create .env for installation in docker
+
+# 1.1.3 (2023-07-06 11:43)
+
+### Features
+
+* Added configuration for Baileys log level in env
+* Added audio to mp4 converter in optionally get Base64 From MediaMessage
+* Added organization name in vcard
+* Added email in vcard
+* Added url in vcard
+* Added verbose logs
+
+### Fixed
+
+* Added timestamp internally in urls to avoid caching
+* Correction in decryption of poll votes
+* Change in the way the api sent and saved the sent messages, now it goes in the messages.upsert event
+* Fixed cash when sending stickers via url
+* Improved how Redis works for instances
+* Fixed problem when disconnecting the instance it removes the instance
+* Fixed problem sending ack when preview is done by me
+* Adjust in store files
+
+# 1.1.2 (2023-06-28 13:43)
+
+### Fixed
+
+* Fixed baileys version in package.json
+* Fixed problem that did not validate if the token passed in create instance already existed
+* Fixed problem that does not delete instance files in server mode
+
+# 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
@@ -26,6 +90,7 @@
 * fixed the problem of not disabling the global webhook by the variable
 * Adjustment in the recording of temporary files and periodic cleaning
 * Fix for container mode also work only with files
+* Remove recording of old messages on sync
 
 # 1.0.9 (2023-06-10)
 

Docker/.env

@@ -1,87 +0,0 @@
-CORS_ORIGIN='*' # Or separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
-CORS_METHODS='POST,GET,PUT,DELETE'
-CORS_CREDENTIALS=true
-
-# Determine the logs to be displayed
-LOG_LEVEL='ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK'
-LOG_COLOR=true
-
-# Determine how long the instance should be deleted from memory in case of no connection.
-# Default time: 5 minutes
-# If you don't even want an expiration, enter the value false
-DEL_INSTANCE=5
-
-# Temporary data storage
-STORE_MESSAGES=true
-STORE_MESSAGE_UP=true
-STORE_CONTACTS=false
-STORE_CHATS=false
-
-CLEAN_STORE_CLEANING_INTERVAL=7200 # seconds ===2h
-CLEAN_STORE_MESSAGES=true
-CLEAN_STORE_MESSAGE_UP=true
-CLEAN_STORE_CONTACTS=false
-CLEAN_STORE_CHATS=false
-
-# Permanent data storage
-DATABASE_ENABLED=false
-DATABASE_CONNECTION_URI='<uri>'
-DATABASE_CONNECTION_DB_PREFIX_NAME='evolution'
-DATABASE_SAVE_DATA_INSTANCE=false
-DATABASE_SAVE_DATA_OLD_MESSAGE=false
-DATABASE_SAVE_DATA_NEW_MESSAGE=true
-DATABASE_SAVE_MESSAGE_UPDATE=true
-DATABASE_SAVE_DATA_CONTACTS=true
-DATABASE_SAVE_DATA_CHATS=true
-
-REDIS_ENABLED=true
-REDIS_URI='<uri>/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_ENABLED=false
-WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=false
-## Set the events you want to hear  
-WEBHOOK_EVENTS_STATUS_INSTANCE=true
-WEBHOOK_EVENTS_APPLICATION_STARTUP=true
-WEBHOOK_EVENTS_QRCODE_UPDATED=true
-WEBHOOK_EVENTS_MESSAGES_SET=true
-WEBHOOK_EVENTS_MESSAGES_UPDATE=true
-WEBHOOK_EVENTS_MESSAGES_UPSERT=true
-WEBHOOK_EVENTS_SEND_MESSAGE=true
-WEBHOOK_EVENTS_CONTACTS_SET=true
-WEBHOOK_EVENTS_CONTACTS_UPSERT=true
-WEBHOOK_EVENTS_CONTACTS_UPDATE=true
-WEBHOOK_EVENTS_PRESENCE_UPDATE=true
-WEBHOOK_EVENTS_CHATS_SET=true
-WEBHOOK_EVENTS_CHATS_UPSERT=true
-WEBHOOK_EVENTS_CHATS_UPDATE=true
-WEBHOOK_EVENTS_CONNECTION_UPDATE=true
-WEBHOOK_EVENTS_GROUPS_UPSERT=false
-WEBHOOK_EVENTS_GROUPS_UPDATE=false
-WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=false
-## This event fires every time a new token is requested via the refresh route
-WEBHOOK_EVENTS_NEW_JWT_TOKEN=true
-
-CONFIG_SESSION_PHONE_CLIENT='Evolution API'
-CONFIG_SESSION_PHONE_NAME='Chrome'
-
-# Set qrcode display limit
-QRCODE_LIMIT=6
-
-# Defines an authentication type for the api
-AUTHENTICATION_TYPE='jwt' # or 'apikey'
-## Define a global apikey to access all instances.
-### OBS: This key must be inserted in the request header to create an instance.
-AUTHENTICATION_API_KEY='t8OOEeISKzpmc3jjcMqBWYSaJsafdefer'
-AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
-## Set the secret key to encrypt and decrypt your token and its expiration time
-AUTHENTICATION_JWT_EXPIRIN_IN=3600 # seconds - 3600s ===1h | zero (0) - never expires
-AUTHENTICATION_JWT_SECRET='L0YWtjb2w554WFqPG'
-
-AUTHENTICATION_INSTANCE_NAME='evolution'
-AUTHENTICATION_INSTANCE_WEBHOOK_URL='<url>'
-AUTHENTICATION_INSTANCE_MODE='container' # or 'server'
-AUTHENTICATION_INSTANCE_WEBHOOK_BY_EVENTS=false

Docker/.env.example

@@ -0,0 +1,92 @@
+CORS_ORIGIN='*' # Or separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
+CORS_METHODS='POST,GET,PUT,DELETE'
+CORS_CREDENTIALS=true
+
+# Determine the logs to be displayed
+LOG_LEVEL='ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS'
+LOG_COLOR=true
+LOG_BAILEYS=error # "fatal" | "error" | "warn" | "info" | "debug" | "trace"
+
+# Determine how long the instance should be deleted from memory in case of no connection.
+# Default time: 5 minutes
+# If you don't even want an expiration, enter the value false
+DEL_INSTANCE=false
+
+# Temporary data storage
+STORE_MESSAGES=true
+STORE_MESSAGE_UP=true
+STORE_CONTACTS=true
+STORE_CHATS=true
+
+CLEAN_STORE_CLEANING_INTERVAL=7200 # seconds === 2h
+CLEAN_STORE_MESSAGES=true
+CLEAN_STORE_MESSAGE_UP=true
+CLEAN_STORE_CONTACTS=true
+CLEAN_STORE_CHATS=true
+
+# Permanent data storage
+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
+DATABASE_SAVE_DATA_INSTANCE=false
+DATABASE_SAVE_DATA_OLD_MESSAGE=false
+DATABASE_SAVE_DATA_NEW_MESSAGE=false
+DATABASE_SAVE_MESSAGE_UPDATE=false
+DATABASE_SAVE_DATA_CONTACTS=false
+DATABASE_SAVE_DATA_CHATS=false
+
+REDIS_ENABLED=false
+REDIS_URI=redis://redis:6379
+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_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
+## Set the events you want to hear  
+WEBHOOK_EVENTS_APPLICATION_STARTUP=false
+WEBHOOK_EVENTS_QRCODE_UPDATED=true
+WEBHOOK_EVENTS_MESSAGES_SET=true
+WEBHOOK_EVENTS_MESSAGES_UPSERT=true
+WEBHOOK_EVENTS_MESSAGES_UPDATE=true
+WEBHOOK_EVENTS_CONTACTS_SET=true
+WEBHOOK_EVENTS_CONTACTS_UPSERT=true
+WEBHOOK_EVENTS_CONTACTS_UPDATE=true
+WEBHOOK_EVENTS_PRESENCE_UPDATE=true
+WEBHOOK_EVENTS_CHATS_SET=true
+WEBHOOK_EVENTS_CHATS_UPSERT=true
+WEBHOOK_EVENTS_CHATS_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=false
+
+# Name that will be displayed on smartphone connection
+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
+AUTHENTICATION_TYPE='apikey' # jwt or 'apikey'
+## Define a global apikey to access all instances.
+### OBS: This key must be inserted in the request header to create an instance.
+AUTHENTICATION_API_KEY='B6D711FCDE4D4FD5936544120E713976'
+AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
+## Set the secret key to encrypt and decrypt your token and its expiration time
+AUTHENTICATION_JWT_EXPIRIN_IN=0 # seconds - 3600s ===1h | zero (0) - never expires
+AUTHENTICATION_JWT_SECRET='L0YWtjb2w554WFqPG'
+# 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_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>'

Docker/mongodb/docker-compose.yaml

@@ -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/redis/docker-compose.yaml

@@ -0,0 +1,17 @@
+version: '3.3'
+
+networks:
+  evolution-net:
+    driver: bridge
+
+services:
+  redis:
+    image: redis:latest
+    container_name: redis
+    ports:
+      - 6379:6379
+    networks:
+      - evolution-net
+
+volumes:
+  evolution_redis:

Dockerfile

@@ -1,5 +1,9 @@
 FROM node:16.18-alpine
 
+LABEL version="1.1.3" description="Api to control whatsapp features through http requests." 
+LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
+LABEL contact="contato@agenciadgcode.com"
+
 RUN apk update && apk upgrade && \
     apk add --no-cache git
 
@@ -16,8 +20,8 @@ ENV CORS_ORIGIN="*"
 ENV CORS_METHODS="POST,GET,PUT,DELETE"
 ENV CORS_CREDENTIALS=true
 
-ENV LOG_LEVEL="ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK"
+ENV LOG_LEVEL=$LOG_LEVEL
-ENV LOG_COLOR=true
+ENV LOG_COLOR=$LOG_COLOR
 
 ENV DEL_INSTANCE=$DEL_INSTANCE
 
@@ -44,18 +48,17 @@ ENV DATABASE_SAVE_DATA_CHATS=$DATABASE_SAVE_DATA_CHATS
 
 ENV REDIS_ENABLED=$REDIS_ENABLED
 ENV REDIS_URI=$REDIS_URI
+ENV REDIS_PREFIX_KEY=$REDIS_PREFIX_KEY
 
 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
 ENV WEBHOOK_EVENTS_MESSAGES_UPDATE=$WEBHOOK_EVENTS_MESSAGES_UPDATE
 ENV WEBHOOK_EVENTS_MESSAGES_UPSERT=$WEBHOOK_EVENTS_MESSAGES_UPSERT
-ENV WEBHOOK_EVENTS_SEND_MESSAGE=$WEBHOOK_EVENTS_SEND_MESSAGE
 ENV WEBHOOK_EVENTS_CONTACTS_SET=$WEBHOOK_EVENTS_CONTACTS_SET
 ENV WEBHOOK_EVENTS_CONTACTS_UPSERT=$WEBHOOK_EVENTS_CONTACTS_UPSERT
 ENV WEBHOOK_EVENTS_CONTACTS_UPDATE=$WEBHOOK_EVENTS_CONTACTS_UPDATE
@@ -71,7 +74,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 +89,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
 

README.md

@@ -2,8 +2,10 @@
 
 <div align="center">
 
-<!-- [![Telegram Group](https://img.shields.io/badge/Group-Telegram-%2333C1FF)](#)-->
+[![Whatsapp Group](https://img.shields.io/badge/Group-WhatsApp-%2322BC18)](https://evolution-api.com/whatsapp)
-<!-- [![Whatsapp Group](https://img.shields.io/badge/Group-WhatsApp-%2322BC18)](#)  -->
+[![Discord Community](https://img.shields.io/badge/Discord-Community-blue)](https://evolution-api.com/discord)
+[![Postman Collection](https://img.shields.io/badge/Postman-Collection-orange)](https://evolution-api.com/postman) 
+[![Documentation](https://img.shields.io/badge/Documentation-Official-green)](https://doc.evolution-api.com)
 [![License](https://img.shields.io/badge/license-GPL--3.0-orange)](./LICENSE)
 [![Support](https://img.shields.io/badge/Buy%20me-coffe-orange)](https://app.picpay.com/user/davidsongomes1998)
 
@@ -16,256 +18,6 @@
 This project is based on the [CodeChat](https://github.com/code-chat-br/whatsapp-api). The original project is an implementation of [Baileys](https://github.com/WhiskeySockets/Baileys), serving as a Restful API service that controls WhatsApp functions.</br> 
 The code allows the creation of multiservice chats, service bots, or any other system that utilizes WhatsApp. The documentation provides instructions on how to set up and use the project, as well as additional information about its features and configuration options.
 
-## Infrastructure
-
-### Nvm installation
-
-```sh
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
-# or
-wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
-```
->
-> After finishing, restart the terminal to load the new information.
->
-
-### Docker installation \[optional\]
-
-```sh
-curl -fsSL https://get.docker.com -o get-docker.sh
-
-sudo sh get-docker.sh
-
-sudo usermod -aG docker ${USER}
-```
-### Nodejs installation
-
-```sh
-nvm install 16.18.1
-```
-
-### pm2 installation
-```sh
-npm i -g pm2
-```
-
-```sh
-docker --version
-
-node --version
-```
-## MongoDb [optional]
-
-After installing docker and docker-compose, up the container.
-  - [compose from mongodb](./mongodb/docker-compose.yaml)
-
-In the same directory where the file is located, run the following command:
-```sh
-bash docker.sh
-```
-Using the database is optional.
-
-## Application startup
-
-Cloning the Repository
-```
-git clone https://github.com/EvolutionAPI/evolution-api.git
-```
-
-Go to the project directory and install all dependencies.</br>
-```sh
-cd whatsapp-api
-
-npm i
-```
-
-Finally, run the command below to start the application:
-```sh
-# Under development
-npm run start
-
-# In production
-npm run start:prod
-
-# pm2
-pm2 start 'npm run start:prod' --name ApiEvolution
-```
-## Authentication
-
-You can define two authentication **types** for the routes in the **[env file](./src/dev-env.yml)**.
-Authentications must be inserted in the request header.
-
-1. **apikey**
-
-2. **jwt:** A JWT is a standard for authentication and information exchange defined with a signature.
-
-> Authentications are generated at instance creation time.
-
-**Note:** There is also the possibility to define a global api key, which can access and control all instances.
-
-### Connection
-
-#### Create an instance
-
-##### HTTP
-
-> *NOTE:* This key must be inserted in the request header to create an instance.
-
-```http
-POST /instance/create HTTP/1.1
-Host: localhost:8080
-Content-Type: application/json
-apikey: t8OOEeISKzpmc3jjcMqBWYSaJH2PIxns
-
-```
-##### cURL
-
-```bash
-curl --location --request POST 'http://localhost:8080/instance/create' \
---header 'Content-Type: application/json' \
---header 'apikey: t8OOEeISKzpmc3jjcMqBWYSaJH2PIxns' \
---data-raw '{
-  "instanceName": "evolution"
-}'
-```
-### Response
-
-```ts
-{
-  "instance": {
-    "instanceName": "evolution",
-    "status": "created"
-  },
-  "hash": {
-    "jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9. [...]"
-
-    // or
-    // "apikey": "88513847-1B0E-4188-8D76-4A2750C9B6C3"
-  }
-}
-```
-#### Connection with qrcode
-
-##### HTTP
-
-```http
-GET /instance/connect/evolution HTTP/1.1
-Host: localhost:8080
-Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9. [...]
-```
-```http
-GET /instance/connect/evolution HTTP/1.1
-Host: localhost:8080
-apikey: 88513847-1B0E-4188-8D76-4A2750C9B6C3
-```
-##### cURL
-
-```bash
-curl --location --request GET 'http://localhost:8080/instance/connect/evolution' \
---header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9. [...]'
-```
-```bash
-curl --location --request GET 'http://localhost:8080/instance/connect/evolution' \
---header 'apikey: 88513847-1B0E-4188-8D76-4A2750C9B6C3'
-```
-
-### Response
-
-```ts
-{
-  "code": "2@nXSUgRJSBY6T0XJmiFKZ0 [...] ,XsgJhJHYa+0MPpXANdPHHt6Ke/I7O2QyXT/Lsge0uSg=",
-  "base64": "data:image/png;base64,iVBORw0KGgoAAAANSUhE [...] LkMtqAAAAABJRU5ErkJggg=="
-}
-```
-
-### App in Docker
-  - [docker run](./docker.sh)
-  - [docker-compose](./docker-compose.yml)
-  - [env for docker](./Docker/.env)
-  - [DockerHub Evolution API](https://hub.docker.com/repository/docker/davidsongomes/evolution-api)
-
-After building the application, in the same directory as the files above, run the following command:
-```sh
-docker-compose up
-```
-## Send Messages
-|     |   |
-|-----|---|
-| Send Text | ✔ |
-| Send Template | ❌ |
-| Send Media: audio - video - image - document - gif <br></br>base64: ```true``` | ✔ |
-| Send Media File | ❌ |
-| Send Audio type WhatsApp | ✔ |
-| Send Location | ✔ |
-| Send Link Preview | ✔ |
-| Send Contact | ✔ |
-| Send Reaction - emoji | ✔ |
-| Send Poll Message | ✔ |
-| Send Buttons (Deprecated) | ❌ |
-| Send List (Deprecated) | ❌ |
-
-## Postman collections
-  - [Postman Json](./postman.json)
-
-## Webhook Events
-
-| Name | Event | TypeData | Description |
-|------|-------|-----------|------------|
-| APPLICATION_STARTUP | application.startup | json | Notifies you when a application startup |
-| QRCODE_UPDATED | qrcode.updated | json | Sends the base64 of the qrcode for reading |
-| CONNECTION_UPDATE | connection.update | json | Informs the status of the connection with whatsapp |
-| MESSAGES_SET | message.set | json | Sends a list of all your messages uploaded on whatsapp</br>This event occurs only once |
-| MESSAGES_UPSERT | message.upsert | json |  Notifies you when a message is received |
-| MESSAGES_UPDATE | message.update | json | Tells you when a message is updated |
-| SEND_MESSAGE | send.message | json | Notifies when a message is sent |
-| CONTACTS_SET | contacts.set | json | Performs initial loading of all contacts</br>This event occurs only once |
-| CONTACTS_UPSERT | contacts.upsert | json | Reloads all contacts with additional information</br>This event occurs only once |
-| CONTACTS_UPDATE | contacts.update | json | Informs you when the chat is updated |
-| PRESENCE_UPDATE | presence.update | json |  Informs if the user is online, if he is performing some action like writing or recording and his last seen</br>'unavailable' | 'available' | 'composing' | 'recording' | 'paused' |
-| CHATS_SET | chats.set | json | Send a list of all loaded chats |
-| CHATS_UPDATE | chats.update | json | Informs you when the chat is updated |
-| CHATS_UPSERT | chats.upsert | json | Sends any new chat information |
-| GROUPS_UPSERT | groups.upsert | JSON | Notifies when a group is created |
-| GROUPS_UPDATE | groups.update | JSON | Notifies when a group has its information updated |
-| GROUP_PARTICIPANTS_UPDATE | group-participants.update | JSON | Notifies when an action occurs involving a participant</br>'add' | 'remove' | 'promote' | 'demote' |
-| NEW_TOKEN | new.jwt | JSON | Notifies when the token (jwt) is updated
-
-## Webhook Routes
-When enabling the WEBHOOK_BY_EVENTS options in the global and local webhooks, the following paths will be added at the end of the webhook.
-<br><br>
-Example:
-
-https://sub.domain.com/webhook-test/exclusive-webhook-code/qrcode-updated
-
-| Name | Path |
-|------|-------|
-| APPLICATION_STARTUP | /application-startup |
-| QRCODE_UPDATED | /qrcode-updated |
-| CONNECTION_UPDATE | /connection-update |
-| MESSAGES_SET | /messages-set |
-| MESSAGES_UPSERT | /messages-upsert |
-| MESSAGES_UPDATE | /messages-update |
-| SEND_MESSAGE | /send-message |
-| CONTACTS_SET | /contacts-set |
-| CONTACTS_UPSERT | /contacts-upsert |
-| CONTACTS_UPDATE | /contacts-update |
-| PRESENCE_UPDATE | /presence-update |
-| CHATS_SET | /chats-set |
-| CHATS_UPDATE | /chats-update |
-| CHATS_UPSERT | /chats-upsert |
-| GROUPS_UPSERT | /groups-upsert |
-| GROUPS_UPDATE | /groups-update |
-| GROUP_PARTICIPANTS_UPDATE | /groups-participants-update |
-| NEW_TOKEN | /new-token |
-## Env File
-
-See additional settings that can be applied through the **env** file by clicking **[here](./src/dev-env.yml)**.
-
-> **⚠️Attention⚠️:** rename the **dev-env.yml** file to **env.yml**.
-
-## SSL
-
-To install the SSL certificate, follow the **[instructions](https://certbot.eff.org/instructions?ws=other&os=ubuntufocal)** below.
 ## SSL
 
 To install the SSL certificate, follow the **[instructions](https://certbot.eff.org/instructions?ws=other&os=ubuntufocal)** below.

docker-compose.yaml

@@ -8,136 +8,20 @@ services:
   api:
     container_name: evolution_api
     image: evolution/api:local
+    restart: always
     ports:
       - 8080:8080
     volumes:
       - evolution_instances:/evolution/instances
       - evolution_store:/evolution/store
-    depends_on:
+    env_file:
-      - mongodb
+      - ./Docker/.env
-      - redis
-    environment:
-      # Determine how long the instance should be deleted from memory in case of no connection.
-      # Default time: 5 minutes
-      # If you don't even want an expiration, enter the value false
-      - DEL_INSTANCE=5 # or false
-      # Temporary data storage
-      - STORE_MESSAGES=true
-      - STORE_MESSAGE_UP=true
-      - STORE_CONTACTS=true
-      - STORE_CHATS=true
-      - CLEAN_STORE_CLEANING_INTERVAL=7200 # seconds === 2h
-      - CLEAN_STORE_MESSAGES=true
-      - CLEAN_STORE_MESSAGE_UP=true
-      - CLEAN_STORE_CONTACTS=true
-      - CLEAN_STORE_CHATS=true
-      # Permanent data storage
-      - DATABASE_ENABLED=true
-      - 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
-      - DATABASE_SAVE_DATA_INSTANCE=true
-      - DATABASE_SAVE_DATA_OLD_MESSAGE=false
-      - DATABASE_SAVE_DATA_NEW_MESSAGE=true
-      - DATABASE_SAVE_MESSAGE_UPDATE=true
-      - DATABASE_SAVE_DATA_CONTACTS=true
-      - DATABASE_SAVE_DATA_CHATS=true
-      - REDIS_ENABLED=true
-      - REDIS_URI=redis://redis:6379
-      - 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_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_SEND_MESSAGE=true
-      - WEBHOOK_EVENTS_CONTACTS_SET=true
-      - WEBHOOK_EVENTS_CONTACTS_UPSERT=true
-      - WEBHOOK_EVENTS_CONTACTS_UPDATE=true
-      - WEBHOOK_EVENTS_PRESENCE_UPDATE=true
-      - WEBHOOK_EVENTS_CHATS_SET=true
-      - WEBHOOK_EVENTS_CHATS_UPSERT=true
-      - WEBHOOK_EVENTS_CHATS_UPDATE=true
-      - WEBHOOK_EVENTS_CONNECTION_UPDATE=true
-      - WEBHOOK_EVENTS_GROUPS_UPSERT=true
-      - WEBHOOK_EVENTS_GROUPS_UPDATE=true
-      - WEBHOOK_EVENTS_GROUP_PARTICIPANTS_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"
-      # Set qrcode display limit
-      - QRCODE_LIMIT=30
-      # Defines an authentication type for the api
-      - AUTHENTICATION_TYPE=apikey # jwt or apikey
-      # Define a global apikey to access all instances
-      # OBS: This key must be inserted in the request header to create an instance.
-      - AUTHENTICATION_API_KEY=B6D711FCDE4D4FD5936544120E713976
-      # Expose the api key on return from fetch instances
-      - AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
-      # Set the secret key to encrypt and decrypt your token and its expiration time.
-      - 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
     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:

docker.sh

@@ -8,11 +8,6 @@ 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
-
 docker build -t ${IMAGE} .
 
 docker compose up -d

mongodb/docker-compose.yaml

@@ -1,28 +0,0 @@
-
-version: '3.8'
-
-networks:
-  api-net:
-    driver: bridge
-
-services:
-  mongodb:
-    container_name: mongodb
-
-    # This image already has a single replica set
-    image: mongo
-
-    restart: always
-    volumes:
-      # sudo mkdir -p /data/mongodb
-      - /data/mongodb:/data/db
-    ports:
-      - 26712:27017
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      # Set a password to access the bank
-      MONGO_INITDB_ROOT_PASSWORD: <password>
-    networks:
-      - api-net
-    expose:
-      - 26712

package.json

@@ -1,8 +1,8 @@
 {
   "name": "evolution-api",
-  "version": "1.2.0",
+  "version": "1.1.4",
   "description": "Rest api for communication with WhatsApp",
-  "main": "index.js",
+  "main": "./dist/src/main.js",
   "scripts": {
     "build": "tsc",
     "start": "ts-node --files --transpile-only ./src/main.ts",
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/DavidsonGomes/evolution-api.git"
+    "url": "git+https://github.com/EvolutionAPI/evolution-api.git"
   },
   "keywords": [
     "chat",
@@ -36,14 +36,14 @@
   },
   "license": "GPL-3.0",
   "bugs": {
-    "url": "https://github.com/DavidsonGomes/evolution-api/issues"
+    "url": "https://github.com/EvolutionAPI/evolution-api/issues"
   },
-  "homepage": "https://github.com/DavidsonGomes/evolution-api#readme",
+  "homepage": "https://github.com/EvolutionAPI/evolution-api#readme",
   "dependencies": {
     "@adiwajshing/keyed-db": "^0.2.4",
-    "@evolution/base": "github:WhiskeySockets/Baileys",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "@hapi/boom": "^10.0.1",
+    "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
     "compression": "^1.7.4",
@@ -65,6 +65,7 @@
     "node-cache": "^5.1.2",
     "node-mime-types": "^1.1.0",
     "pino": "^8.11.0",
+    "proxy-agent": "^6.2.1",
     "qrcode": "^1.5.1",
     "qrcode-terminal": "^0.12.0",
     "redis": "^4.6.5",

src/config/env.config.ts

@@ -13,10 +13,22 @@ export type Cors = {
   CREDENTIALS: boolean;
 };
 
-export type LogLevel = 'ERROR' | 'WARN' | 'DEBUG' | 'INFO' | 'LOG' | 'VERBOSE' | 'DARK';
+export type LogBaileys = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
+
+export type LogLevel =
+  | 'ERROR'
+  | 'WARN'
+  | 'DEBUG'
+  | 'INFO'
+  | 'LOG'
+  | 'VERBOSE'
+  | 'DARK'
+  | 'WEBHOOKS';
+
 export type Log = {
   LEVEL: LogLevel[];
   COLOR: boolean;
+  BAILEYS: LogBaileys;
 };
 
 export type SaveData = {
@@ -65,7 +77,6 @@ export type EventsWebhook = {
   MESSAGES_SET: boolean;
   MESSAGES_UPSERT: boolean;
   MESSAGES_UPDATE: boolean;
-  SEND_MESSAGE: boolean;
   CONTACTS_SET: boolean;
   CONTACTS_UPDATE: boolean;
   CONTACTS_UPSERT: boolean;
@@ -87,7 +98,6 @@ export type Instance = {
   NAME: string;
   WEBHOOK_URL: string;
   MODE: string;
-  WEBHOOK_BY_EVENTS: boolean;
 };
 export type Auth = {
   API_KEY: ApiKey;
@@ -150,7 +160,9 @@ export class ConfigService {
   }
 
   private envYaml(): Env {
-    return load(readFileSync(join(SRC_DIR, 'env.yml'), { encoding: 'utf-8' })) as Env;
+    return load(
+      readFileSync(join(process.cwd(), 'src', 'env.yml'), { encoding: 'utf-8' }),
+    ) as Env;
   }
 
   private envProcess(): Env {
@@ -206,6 +218,7 @@ export class ConfigService {
       LOG: {
         LEVEL: process.env?.LOG_LEVEL.split(',') as LogLevel[],
         COLOR: process.env?.LOG_COLOR === 'true',
+        BAILEYS: (process.env?.LOG_BAILEYS as LogBaileys) || 'error',
       },
       DEL_INSTANCE: isBooleanString(process.env?.DEL_INSTANCE)
         ? process.env.DEL_INSTANCE === 'true'
@@ -222,7 +235,6 @@ export class ConfigService {
           MESSAGES_SET: process.env?.WEBHOOK_EVENTS_MESSAGES_SET === 'true',
           MESSAGES_UPSERT: process.env?.WEBHOOK_EVENTS_MESSAGES_UPSERT === 'true',
           MESSAGES_UPDATE: process.env?.WEBHOOK_EVENTS_MESSAGES_UPDATE === 'true',
-          SEND_MESSAGE: process.env?.WEBHOOK_EVENTS_SEND_MESSAGE === 'true',
           CONTACTS_SET: process.env?.WEBHOOK_EVENTS_CONTACTS_SET === 'true',
           CONTACTS_UPDATE: process.env?.WEBHOOK_EVENTS_CONTACTS_UPDATE === 'true',
           CONTACTS_UPSERT: process.env?.WEBHOOK_EVENTS_CONTACTS_UPSERT === 'true',
@@ -263,8 +275,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',
         },
       },
     };

src/config/logger.config.ts

@@ -67,7 +67,6 @@ export class Logger {
     this.configService.get<Log>('LOG').LEVEL.forEach((level) => types.push(Type[level]));
 
     const typeValue = typeof value;
-
     if (types.includes(type)) {
       if (configService.get<Log>('LOG').COLOR) {
         console.log(

src/config/path.config.ts

@@ -4,3 +4,4 @@ export const ROOT_DIR = process.cwd();
 export const INSTANCE_DIR = join(ROOT_DIR, 'instances');
 export const SRC_DIR = join(ROOT_DIR, 'src');
 export const AUTH_DIR = join(ROOT_DIR, 'store', 'auth');
+export const STORE_DIR = join(ROOT_DIR, 'store');

src/db/db.connect.ts

@@ -2,13 +2,23 @@ import mongoose from 'mongoose';
 import { configService, Database } from '../config/env.config';
 import { Logger } from '../config/logger.config';
 
-const logger = new Logger('Db Connection');
+const logger = new Logger('MongoDB');
 
 const db = configService.get<Database>('DATABASE');
-export const dbserver = db.ENABLED
+export const dbserver = (() => {
-  ? mongoose.createConnection(db.CONNECTION.URI, {
+  if (db.ENABLED) {
+    logger.verbose('connecting');
+    const dbs = mongoose.createConnection(db.CONNECTION.URI, {
       dbName: db.CONNECTION.DB_PREFIX_NAME + '-whatsapp-api',
-    })
+    });
-  : null;
+    logger.verbose('connected in ' + db.CONNECTION.URI);
+    logger.info('ON - dbName: ' + dbs['$dbName']);
 
-db.ENABLED ? logger.info('ON - dbName: ' + dbserver['$dbName']) : null;
+    process.on('beforeExit', () => {
+      logger.verbose('instance destroyed');
+      dbserver.destroy(true, (error) => logger.error(error));
+    });
+
+    return dbs;
+  }
+})();

src/db/redis.client.ts

@@ -1,24 +1,44 @@
 import { createClient, RedisClientType } from '@redis/client';
 import { Logger } from '../config/logger.config';
-import { BufferJSON } from '@evolution/base';
+import { BufferJSON } from '@whiskeysockets/baileys';
 import { Redis } from '../config/env.config';
 
 export class RedisCache {
-  constructor(private readonly redisEnv: Partial<Redis>, private instanceName?: string) {
+  constructor() {
-    this.client = createClient({ url: this.redisEnv.URI });
+    this.logger.verbose('instance created');
-
+    process.on('beforeExit', async () => {
-    this.client.connect();
+      this.logger.verbose('instance destroyed');
+      if (this.statusConnection) {
+        this.logger.verbose('instance disconnect');
+        await this.client.disconnect();
+      }
+    });
   }
 
+  private statusConnection = false;
+  private instanceName: string;
+  private redisEnv: Redis;
+
   public set reference(reference: string) {
+    this.logger.verbose('set reference: ' + reference);
     this.instanceName = reference;
   }
 
+  public async connect(redisEnv: Redis) {
+    this.logger.verbose('connecting');
+    this.client = createClient({ url: redisEnv.URI });
+    this.logger.verbose('connected in ' + redisEnv.URI);
+    await this.client.connect();
+    this.statusConnection = true;
+    this.redisEnv = redisEnv;
+  }
+
   private readonly logger = new Logger(RedisCache.name);
   private client: RedisClientType;
 
   public async instanceKeys(): Promise<string[]> {
     try {
+      this.logger.verbose('instance keys: ' + this.redisEnv.PREFIX_KEY + ':*');
       return await this.client.sendCommand(['keys', this.redisEnv.PREFIX_KEY + ':*']);
     } catch (error) {
       this.logger.error(error);
@@ -27,14 +47,18 @@ export class RedisCache {
 
   public async keyExists(key?: string) {
     if (key) {
+      this.logger.verbose('keyExists: ' + key);
       return !!(await this.instanceKeys()).find((i) => i === key);
     }
+    this.logger.verbose('keyExists: ' + this.instanceName);
     return !!(await this.instanceKeys()).find((i) => i === this.instanceName);
   }
 
   public async writeData(field: string, data: any) {
     try {
+      this.logger.verbose('writeData: ' + field);
       const json = JSON.stringify(data, BufferJSON.replacer);
+
       return await this.client.hSet(
         this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
         field,
@@ -47,13 +71,19 @@ export class RedisCache {
 
   public async readData(field: string) {
     try {
+      this.logger.verbose('readData: ' + field);
       const data = await this.client.hGet(
         this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
         field,
       );
+
       if (data) {
+        this.logger.verbose('readData: ' + field + ' success');
         return JSON.parse(data, BufferJSON.reviver);
       }
+
+      this.logger.verbose('readData: ' + field + ' not found');
+      return null;
     } catch (error) {
       this.logger.error(error);
     }
@@ -61,6 +91,7 @@ export class RedisCache {
 
   public async removeData(field: string) {
     try {
+      this.logger.verbose('removeData: ' + field);
       return await this.client.hDel(
         this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
         field,
@@ -72,9 +103,12 @@ export class RedisCache {
 
   public async delAll(hash?: string) {
     try {
-      return await this.client.del(
+      this.logger.verbose('instance delAll: ' + hash);
+      const result = await this.client.del(
         hash || this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
       );
+
+      return result;
     } catch (error) {
       this.logger.error(error);
     }

src/dev-env.yml

@@ -36,7 +36,9 @@ LOG:
     - LOG
     - VERBOSE
     - DARK
+    - WEBHOOKS
   COLOR: true
+  BAILEYS: error # "fatal" | "error" | "warn" | "info" | "debug" | "trace"
 
 # Determine how long the instance should be deleted from memory in case of no connection.
 # Default time: 5 minutes
@@ -59,7 +61,7 @@ CLEAN_STORE:
 
 # Permanent data storage
 DATABASE:
-  ENABLED: true
+  ENABLED: false
   CONNECTION:
     URI: 'mongodb://root:root@localhost:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true'
     DB_PREFIX_NAME: evolution
@@ -67,14 +69,14 @@ DATABASE:
   SAVE_DATA:
     INSTANCE: false
     OLD_MESSAGE: false
-    NEW_MESSAGE: true
+    NEW_MESSAGE: false
-    MESSAGE_UPDATE: true
+    MESSAGE_UPDATE: false
-    CONTACTS: true
+    CONTACTS: false
-    CHATS: true
+    CHATS: false
 
 REDIS:
-  ENABLED: true
+  ENABLED: false
-  URI: 'redis://localhost:6379/1'
+  URI: 'redis://localhost:6379'
   PREFIX_KEY: 'evolution'
 
 # Webhook Settings
@@ -82,18 +84,17 @@ WEBHOOK:
   # Define a global webhook that will listen for enabled events from all instances
   GLOBAL:
     URL: <url>
-    ENABLED: true
+    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_BY_EVENTS: false
   # Automatically maps webhook paths
   # Set the events you want to hear  
   EVENTS:
-    APPLICATION_STARTUP: true
+    APPLICATION_STARTUP: false
     QRCODE_UPDATED: true
     MESSAGES_SET: true
     MESSAGES_UPSERT: true
     MESSAGES_UPDATE: true
-    SEND_MESSAGE: true
     CONTACTS_SET: true
     CONTACTS_UPSERT: true
     CONTACTS_UPDATE: true
@@ -107,12 +108,12 @@ WEBHOOK:
     GROUP_PARTICIPANTS_UPDATE: true
     CONNECTION_UPDATE: true
     # This event fires every time a new token is requested via the refresh route
-    NEW_JWT_TOKEN: true
+    NEW_JWT_TOKEN: false
 
 CONFIG_SESSION_PHONE:
   # Name that will be displayed on smartphone connection
   CLIENT: 'Evolution API'
-  NAME: Chrome # firefox | edge | opera | safari
+  NAME: chrome # chrome | firefox | edge | opera | safari
 
 # Set qrcode display limit
 QRCODE:
@@ -120,11 +121,11 @@ QRCODE:
 
 # Defines an authentication type for the api
 AUTHENTICATION:
-  TYPE: apikey # or jwt apikey
+  TYPE: apikey # jwt or apikey
   # Define a global apikey to access all instances
   API_KEY:
     # OBS: This key must be inserted in the request header to create an instance.
-    KEY: B6D711FC-DE4D-4FD5-9365-44120E713976
+    KEY: B6D711FCDE4D4FD5936544120E713976
   # Expose the api key on return from fetch instances
   EXPOSE_IN_FETCH_INSTANCES: true
   # Set the secret key to encrypt and decrypt your token and its expiration time.
@@ -134,7 +135,6 @@ AUTHENTICATION:
   # Set the instance name and webhook url to create an instance in init the application
   INSTANCE:
   # With this option activated, you work with a url per webhook event, respecting the local url and the name of each event
-    WEBHOOK_BY_EVENTS: false
     MODE: server # container or server
     # if you are using container mode, set the container name and the webhook url to default instance
     NAME: evolution

src/main.ts

@@ -16,8 +16,6 @@ function initWA() {
 }
 
 function bootstrap() {
-  initWA();
-
   const logger = new Logger('SERVER');
   const app = express();
 
@@ -34,8 +32,8 @@ function bootstrap() {
       methods: [...configService.get<Cors>('CORS').METHODS],
       credentials: configService.get<Cors>('CORS').CREDENTIALS,
     }),
-    urlencoded({ extended: true, limit: '50mb' }),
+    urlencoded({ extended: true, limit: '136mb' }),
-    json({ limit: '50mb' }),
+    json({ limit: '136mb' }),
     compression(),
   );
 
@@ -73,6 +71,8 @@ function bootstrap() {
     logger.log(httpServer.TYPE.toUpperCase() + ' - ON: ' + httpServer.PORT),
   );
 
+  initWA();
+
   onUnexpectedError();
 }
 

src/utils/use-multi-file-auth-state-db.ts

@@ -5,7 +5,7 @@ import {
   initAuthCreds,
   proto,
   SignalDataTypeMap,
-} from '@evolution/base';
+} from '@whiskeysockets/baileys';
 import { configService, Database } from '../config/env.config';
 import { Logger } from '../config/logger.config';
 import { dbserver } from '../db/db.connect';

src/utils/use-multi-file-auth-state-redis-db.ts

@@ -4,22 +4,17 @@ import {
   initAuthCreds,
   proto,
   SignalDataTypeMap,
-} from '@evolution/base';
+} from '@whiskeysockets/baileys';
 import { RedisCache } from '../db/redis.client';
 import { Logger } from '../config/logger.config';
 import { Redis } from '../config/env.config';
 
-export async function useMultiFileAuthStateRedisDb(
+export async function useMultiFileAuthStateRedisDb(cache: RedisCache): Promise<{
-  redisEnv: Partial<Redis>,
-  instanceName: string,
-): Promise<{
   state: AuthenticationState;
   saveCreds: () => Promise<void>;
 }> {
   const logger = new Logger(useMultiFileAuthStateRedisDb.name);
 
-  const cache = new RedisCache(redisEnv, instanceName);
-
   const writeData = async (data: any, key: string): Promise<any> => {
     try {
       return await cache.writeData(key, data);

src/validate/validate.schema.ts

@@ -27,9 +27,10 @@ export const instanceNameSchema: JSONSchema7 = {
   properties: {
     instanceName: { type: 'string' },
     webhook: { type: 'string' },
+    webhook_by_events: { type: 'boolean' },
     events: {
       type: 'array',
-      minItems: 1,
+      minItems: 0,
       items: {
         type: 'string',
         enum: [
@@ -38,7 +39,6 @@ export const instanceNameSchema: JSONSchema7 = {
           'MESSAGES_SET',
           'MESSAGES_UPSERT',
           'MESSAGES_UPDATE',
-          'SEND_MESSAGE',
           'CONTACTS_SET',
           'CONTACTS_UPSERT',
           'CONTACTS_UPDATE',
@@ -189,6 +189,37 @@ export const pollMessageSchema: JSONSchema7 = {
   required: ['pollMessage', 'number'],
 };
 
+export const statusMessageSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    statusMessage: {
+      type: 'object',
+      properties: {
+        type: { type: 'string', enum: ['text', 'image', 'audio', 'video'] },
+        content: { type: 'string' },
+        caption: { type: 'string' },
+        backgroundColor: { type: 'string' },
+        font: { type: 'integer', minimum: 0, maximum: 5 },
+        statusJidList: {
+          type: 'array',
+          minItems: 1,
+          uniqueItems: true,
+          items: {
+            type: 'string',
+            pattern: '^\\d+',
+            description: '"statusJidList" must be an array of numeric strings',
+          },
+        },
+        allContacts: { type: 'boolean', enum: [true, false] },
+      },
+      required: ['type', 'content'],
+      ...isNotEmpty('type', 'content'),
+    },
+  },
+  required: ['statusMessage'],
+};
+
 export const mediaMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
@@ -379,6 +410,9 @@ export const contactMessageSchema: JSONSchema7 = {
             description: '"wuid" must be a numeric string',
           },
           phoneNumber: { type: 'string', minLength: 10 },
+          organization: { type: 'string' },
+          email: { type: 'string' },
+          url: { type: 'string' },
         },
         required: ['fullName', 'wuid', 'phoneNumber'],
         ...isNotEmpty('fullName'),
@@ -665,6 +699,28 @@ export const groupJidSchema: JSONSchema7 = {
   ...isNotEmpty('groupJid'),
 };
 
+export const groupSendInviteSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    groupJid: { type: 'string' },
+    description: { type: 'string' },
+    numbers: {
+      type: 'array',
+      minItems: 1,
+      uniqueItems: true,
+      items: {
+        type: 'string',
+        minLength: 10,
+        pattern: '\\d+',
+        description: '"numbers" must be an array of numeric strings',
+      },
+    },
+  },
+  required: ['groupJid', 'description', 'numbers'],
+  ...isNotEmpty('groupJid', 'description', 'numbers'),
+};
+
 export const groupInviteSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
@@ -770,7 +826,7 @@ export const webhookSchema: JSONSchema7 = {
     enabled: { type: 'boolean', enum: [true, false] },
     events: {
       type: 'array',
-      minItems: 1,
+      minItems: 0,
       items: {
         type: 'string',
         enum: [
@@ -779,7 +835,6 @@ export const webhookSchema: JSONSchema7 = {
           'MESSAGES_SET',
           'MESSAGES_UPSERT',
           'MESSAGES_UPDATE',
-          'SEND_MESSAGE',
           'CONTACTS_SET',
           'CONTACTS_UPSERT',
           'CONTACTS_UPDATE',

src/whatsapp/abstract/abstract.repository.ts

@@ -6,7 +6,8 @@ import { ROOT_DIR } from '../../config/path.config';
 export type IInsert = { insertCount: number };
 
 export interface IRepository {
-  insert(data: any, saveDb?: boolean): Promise<IInsert>;
+  insert(data: any, instanceName: string, saveDb?: boolean): Promise<IInsert>;
+  update(data: any, instanceName: string, saveDb?: boolean): Promise<IInsert>;
   find(query: any): Promise<any>;
   delete(query: any, force?: boolean): Promise<any>;
 
@@ -45,9 +46,14 @@ export abstract class Repository implements IRepository {
     }
   };
 
-  public insert(data: any, saveDb = false): Promise<IInsert> {
+  public insert(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
     throw new Error('Method not implemented.');
   }
+
+  public update(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
+    throw new Error('Method not implemented.');
+  }
+
   public find(query: any): Promise<any> {
     throw new Error('Method not implemented.');
   }

src/whatsapp/controllers/chat.controller.ts

@@ -1,4 +1,4 @@
-import { proto } from '@evolution/base';
+import { proto } from '@whiskeysockets/baileys';
 import {
   ArchiveChatDto,
   DeleteMessage,
@@ -9,62 +9,77 @@ import {
   ProfileStatusDto,
   ReadMessageDto,
   WhatsAppNumberDto,
+  getBase64FromMediaMessageDto,
 } from '../dto/chat.dto';
 import { InstanceDto } from '../dto/instance.dto';
 import { ContactQuery } from '../repository/contact.repository';
 import { MessageQuery } from '../repository/message.repository';
 import { MessageUpQuery } from '../repository/messageUp.repository';
 import { WAMonitoringService } from '../services/monitor.service';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('ChatController');
 
 export class ChatController {
   constructor(private readonly waMonitor: WAMonitoringService) {}
 
   public async whatsappNumber({ instanceName }: InstanceDto, data: WhatsAppNumberDto) {
+    logger.verbose('requested whatsappNumber from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].whatsappNumber(data);
   }
 
   public async readMessage({ instanceName }: InstanceDto, data: ReadMessageDto) {
+    logger.verbose('requested readMessage from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].markMessageAsRead(data);
   }
 
   public async archiveChat({ instanceName }: InstanceDto, data: ArchiveChatDto) {
+    logger.verbose('requested archiveChat from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].archiveChat(data);
   }
 
   public async deleteMessage({ instanceName }: InstanceDto, data: DeleteMessage) {
+    logger.verbose('requested deleteMessage from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].deleteMessage(data);
   }
 
   public async fetchProfilePicture({ instanceName }: InstanceDto, data: NumberDto) {
+    logger.verbose('requested fetchProfilePicture from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].profilePicture(data.number);
   }
 
   public async fetchContacts({ instanceName }: InstanceDto, query: ContactQuery) {
+    logger.verbose('requested fetchContacts from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchContacts(query);
   }
 
   public async getBase64FromMediaMessage(
     { instanceName }: InstanceDto,
-    message: proto.IWebMessageInfo,
+    data: getBase64FromMediaMessageDto,
   ) {
-    return await this.waMonitor.waInstances[instanceName].getBase64FromMediaMessage(
+    logger.verbose(
-      message,
+      'requested getBase64FromMediaMessage from ' + instanceName + ' instance',
     );
+    return await this.waMonitor.waInstances[instanceName].getBase64FromMediaMessage(data);
   }
 
   public async fetchMessages({ instanceName }: InstanceDto, query: MessageQuery) {
+    logger.verbose('requested fetchMessages from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchMessages(query);
   }
 
   public async fetchStatusMessage({ instanceName }: InstanceDto, query: MessageUpQuery) {
+    logger.verbose('requested fetchStatusMessage from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchStatusMessage(query);
   }
 
   public async fetchChats({ instanceName }: InstanceDto) {
+    logger.verbose('requested fetchChats from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchChats();
   }
 
   public async fetchPrivacySettings({ instanceName }: InstanceDto) {
+    logger.verbose('requested fetchPrivacySettings from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchPrivacySettings();
   }
 
@@ -72,6 +87,7 @@ export class ChatController {
     { instanceName }: InstanceDto,
     data: PrivacySettingDto,
   ) {
+    logger.verbose('requested updatePrivacySettings from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].updatePrivacySettings(data);
   }
 
@@ -79,12 +95,14 @@ export class ChatController {
     { instanceName }: InstanceDto,
     data: ProfilePictureDto,
   ) {
+    logger.verbose('requested fetchBusinessProfile from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchBusinessProfile(
       data.number,
     );
   }
 
   public async updateProfileName({ instanceName }: InstanceDto, data: ProfileNameDto) {
+    logger.verbose('requested updateProfileName from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].updateProfileName(data.name);
   }
 
@@ -92,6 +110,7 @@ export class ChatController {
     { instanceName }: InstanceDto,
     data: ProfileStatusDto,
   ) {
+    logger.verbose('requested updateProfileStatus from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].updateProfileStatus(
       data.status,
     );
@@ -101,6 +120,7 @@ export class ChatController {
     { instanceName }: InstanceDto,
     data: ProfilePictureDto,
   ) {
+    logger.verbose('requested updateProfilePicture from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].updateProfilePicture(
       data.picture,
     );
@@ -110,6 +130,7 @@ export class ChatController {
     { instanceName }: InstanceDto,
     data: ProfilePictureDto,
   ) {
+    logger.verbose('requested removeProfilePicture from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].removeProfilePicture();
   }
 }

src/whatsapp/controllers/group.controller.ts

@@ -4,6 +4,7 @@ import {
   GroupInvite,
   GroupJid,
   GroupPictureDto,
+  GroupSendInvite,
   GroupSubjectDto,
   GroupToggleEphemeralDto,
   GroupUpdateParticipantDto,
@@ -11,21 +12,31 @@ import {
 } from '../dto/group.dto';
 import { InstanceDto } from '../dto/instance.dto';
 import { WAMonitoringService } from '../services/monitor.service';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('ChatController');
 
 export class GroupController {
   constructor(private readonly waMonitor: WAMonitoringService) {}
 
   public async createGroup(instance: InstanceDto, create: CreateGroupDto) {
+    logger.verbose('requested createGroup from ' + instance.instanceName + ' instance');
     return await this.waMonitor.waInstances[instance.instanceName].createGroup(create);
   }
 
   public async updateGroupPicture(instance: InstanceDto, update: GroupPictureDto) {
+    logger.verbose(
+      'requested updateGroupPicture from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGroupPicture(
       update,
     );
   }
 
   public async updateGroupSubject(instance: InstanceDto, update: GroupSubjectDto) {
+    logger.verbose(
+      'requested updateGroupSubject from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGroupSubject(
       update,
     );
@@ -35,40 +46,54 @@ export class GroupController {
     instance: InstanceDto,
     update: GroupDescriptionDto,
   ) {
+    logger.verbose(
+      'requested updateGroupDescription from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGroupDescription(
       update,
     );
   }
 
   public async findGroupInfo(instance: InstanceDto, groupJid: GroupJid) {
+    logger.verbose('requested findGroupInfo from ' + instance.instanceName + ' instance');
     return await this.waMonitor.waInstances[instance.instanceName].findGroup(groupJid);
   }
 
   public async fetchAllGroups(instance: InstanceDto) {
+    logger.verbose(
+      'requested fetchAllGroups from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].fetchAllGroups();
   }
 
   public async inviteCode(instance: InstanceDto, groupJid: GroupJid) {
+    logger.verbose('requested inviteCode from ' + instance.instanceName + ' instance');
     return await this.waMonitor.waInstances[instance.instanceName].inviteCode(groupJid);
   }
 
   public async inviteInfo(instance: InstanceDto, inviteCode: GroupInvite) {
+    logger.verbose('requested inviteInfo from ' + instance.instanceName + ' instance');
     return await this.waMonitor.waInstances[instance.instanceName].inviteInfo(inviteCode);
   }
 
-  public async acceptInvite(instance: InstanceDto, inviteCode: GroupInvite) {
+  public async sendInvite(instance: InstanceDto, data: GroupSendInvite) {
-    return await this.waMonitor.waInstances[instance.instanceName].acceptInvite(
+    logger.verbose('requested sendInvite from ' + instance.instanceName + ' instance');
-      inviteCode,
+    return await this.waMonitor.waInstances[instance.instanceName].sendInvite(data);
-    );
   }
 
   public async revokeInviteCode(instance: InstanceDto, groupJid: GroupJid) {
+    logger.verbose(
+      'requested revokeInviteCode from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].revokeInviteCode(
       groupJid,
     );
   }
 
   public async findParticipants(instance: InstanceDto, groupJid: GroupJid) {
+    logger.verbose(
+      'requested findParticipants from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].findParticipants(
       groupJid,
     );
@@ -78,22 +103,32 @@ export class GroupController {
     instance: InstanceDto,
     update: GroupUpdateParticipantDto,
   ) {
+    logger.verbose(
+      'requested updateGParticipate from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGParticipant(
       update,
     );
   }
 
   public async updateGSetting(instance: InstanceDto, update: GroupUpdateSettingDto) {
+    logger.verbose(
+      'requested updateGSetting from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGSetting(update);
   }
 
   public async toggleEphemeral(instance: InstanceDto, update: GroupToggleEphemeralDto) {
+    logger.verbose(
+      'requested toggleEphemeral from ' + instance.instanceName + ' instance',
+    );
     return await this.waMonitor.waInstances[instance.instanceName].toggleEphemeral(
       update,
     );
   }
 
   public async leaveGroup(instance: InstanceDto, groupJid: GroupJid) {
+    logger.verbose('requested leaveGroup from ' + instance.instanceName + ' instance');
     return await this.waMonitor.waInstances[instance.instanceName].leaveGroup(groupJid);
   }
 }

src/whatsapp/controllers/instance.controller.ts

@@ -1,4 +1,4 @@
-import { delay } from '@evolution/base';
+import { delay } from '@whiskeysockets/baileys';
 import EventEmitter2 from 'eventemitter2';
 import { Auth, ConfigService } from '../../config/env.config';
 import { BadRequestException, InternalServerErrorException } from '../../exceptions';
@@ -10,6 +10,7 @@ import { WAStartupService } from '../services/whatsapp.service';
 import { WebhookService } from '../services/webhook.service';
 import { Logger } from '../../config/logger.config';
 import { wa } from '../types/wa.types';
+import { RedisCache } from '../../db/redis.client';
 
 export class InstanceController {
   constructor(
@@ -19,6 +20,7 @@ export class InstanceController {
     private readonly eventEmitter: EventEmitter2,
     private readonly authService: AuthService,
     private readonly webhookService: WebhookService,
+    private readonly cache: RedisCache,
   ) {}
 
   private readonly logger = new Logger(InstanceController.name);
@@ -26,13 +28,18 @@ export class InstanceController {
   public async createInstance({
     instanceName,
     webhook,
+    webhook_by_events,
     events,
     qrcode,
     token,
   }: InstanceDto) {
+    this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
+
     const mode = this.configService.get<Auth>('AUTHENTICATION').INSTANCE.MODE;
 
     if (mode === 'container') {
+      this.logger.verbose('container mode');
+
       if (Object.keys(this.waMonitor.waInstances).length > 0) {
         throw new BadRequestException([
           'Instance already created',
@@ -40,15 +47,23 @@ export class InstanceController {
         ]);
       }
 
+      this.logger.verbose('checking duplicate token');
+      await this.authService.checkDuplicateToken(token);
+
+      this.logger.verbose('creating instance');
       const instance = new WAStartupService(
         this.configService,
         this.eventEmitter,
         this.repository,
+        this.cache,
       );
       instance.instanceName = instanceName;
+      this.logger.verbose('instance: ' + instance.instanceName + ' created');
+
       this.waMonitor.waInstances[instance.instanceName] = instance;
       this.waMonitor.delInstanceTime(instance.instanceName);
 
+      this.logger.verbose('generating hash');
       const hash = await this.authService.generateHash(
         {
           instanceName: instance.instanceName,
@@ -56,11 +71,19 @@ export class InstanceController {
         token,
       );
 
+      this.logger.verbose('hash: ' + hash + ' generated');
+
       let getEvents: string[];
 
       if (webhook) {
+        this.logger.verbose('creating webhook');
         try {
-          this.webhookService.create(instance, { enabled: true, url: webhook, events });
+          this.webhookService.create(instance, {
+            enabled: true,
+            url: webhook,
+            events,
+            webhook_by_events,
+          });
 
           getEvents = (await this.webhookService.find(instance)).events;
         } catch (error) {
@@ -68,6 +91,17 @@ export class InstanceController {
         }
       }
 
+      this.logger.verbose('instance created');
+      this.logger.verbose({
+        instance: {
+          instanceName: instance.instanceName,
+          status: 'created',
+        },
+        hash,
+        webhook,
+        events: getEvents,
+      });
+
       return {
         instance: {
           instanceName: instance.instanceName,
@@ -78,15 +112,26 @@ export class InstanceController {
         events: getEvents,
       };
     } else {
+      this.logger.verbose('server mode');
+
+      this.logger.verbose('checking duplicate token');
+      await this.authService.checkDuplicateToken(token);
+
+      this.logger.verbose('creating instance');
       const instance = new WAStartupService(
         this.configService,
         this.eventEmitter,
         this.repository,
+        this.cache,
       );
       instance.instanceName = instanceName;
+
+      this.logger.verbose('instance: ' + instance.instanceName + ' created');
+
       this.waMonitor.waInstances[instance.instanceName] = instance;
       this.waMonitor.delInstanceTime(instance.instanceName);
 
+      this.logger.verbose('generating hash');
       const hash = await this.authService.generateHash(
         {
           instanceName: instance.instanceName,
@@ -94,11 +139,19 @@ export class InstanceController {
         token,
       );
 
+      this.logger.verbose('hash: ' + hash + ' generated');
+
       let getEvents: string[];
 
       if (webhook) {
+        this.logger.verbose('creating webhook');
         try {
-          this.webhookService.create(instance, { enabled: true, url: webhook, events });
+          this.webhookService.create(instance, {
+            enabled: true,
+            url: webhook,
+            events,
+            webhook_by_events,
+          });
 
           getEvents = (await this.webhookService.find(instance)).events;
         } catch (error) {
@@ -109,11 +162,25 @@ export class InstanceController {
       let getQrcode: wa.QrCode;
 
       if (qrcode) {
+        this.logger.verbose('creating qrcode');
         await instance.connectToWhatsapp();
         await delay(2000);
         getQrcode = instance.qrCode;
       }
 
+      this.logger.verbose('instance created');
+      this.logger.verbose({
+        instance: {
+          instanceName: instance.instanceName,
+          status: 'created',
+        },
+        hash,
+        webhook,
+        webhook_by_events,
+        events: getEvents,
+        qrcode: getQrcode,
+      });
+
       return {
         instance: {
           instanceName: instance.instanceName,
@@ -121,6 +188,7 @@ export class InstanceController {
         },
         hash,
         webhook,
+        webhook_by_events,
         events: getEvents,
         qrcode: getQrcode,
       };
@@ -129,11 +197,18 @@ export class InstanceController {
 
   public async connectToWhatsapp({ instanceName }: InstanceDto) {
     try {
+      this.logger.verbose(
+        'requested connectToWhatsapp from ' + instanceName + ' instance',
+      );
+
       const instance = this.waMonitor.waInstances[instanceName];
       const state = instance?.connectionStatus?.state;
 
+      this.logger.verbose('state: ' + state);
+
       switch (state) {
         case 'close':
+          this.logger.verbose('connecting');
           await instance.connectToWhatsapp();
           await delay(2000);
           return instance.qrCode;
@@ -147,12 +222,44 @@ export class InstanceController {
     }
   }
 
+  public async restartInstance({ instanceName }: InstanceDto) {
+    try {
+      this.logger.verbose('requested restartInstance from ' + instanceName + ' instance');
+
+      this.logger.verbose('deleting instance: ' + instanceName);
+      delete this.waMonitor.waInstances[instanceName];
+
+      this.logger.verbose('creating instance: ' + instanceName);
+      const instance = new WAStartupService(
+        this.configService,
+        this.eventEmitter,
+        this.repository,
+        this.cache,
+      );
+
+      instance.instanceName = instanceName;
+
+      this.logger.verbose('instance: ' + instance.instanceName + ' created');
+
+      this.logger.verbose('connecting instance: ' + instanceName);
+      await instance.connectToWhatsapp();
+      this.waMonitor.waInstances[instance.instanceName] = instance;
+
+      return { error: false, message: 'Instance restarted' };
+    } catch (error) {
+      this.logger.error(error);
+    }
+  }
+
   public async connectionState({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
     return this.waMonitor.waInstances[instanceName]?.connectionStatus;
   }
 
   public async fetchInstances({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
     if (instanceName) {
+      this.logger.verbose('instanceName: ' + instanceName);
       return this.waMonitor.instanceInfo(instanceName);
     }
 
@@ -160,13 +267,15 @@ export class InstanceController {
   }
 
   public async logout({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested logout from ' + instanceName + ' instance');
     try {
+      this.logger.verbose('logging out instance: ' + instanceName);
       await this.waMonitor.waInstances[instanceName]?.client?.logout(
         'Log out instance: ' + instanceName,
       );
 
+      this.logger.verbose('close connection instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
-      this.waMonitor.waInstances[instanceName]?.client?.end(undefined);
 
       return { error: false, message: 'Instance logged out' };
     } catch (error) {
@@ -175,7 +284,9 @@ export class InstanceController {
   }
 
   public async deleteInstance({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
     const stateConn = await this.connectionState({ instanceName });
+
     if (stateConn.state === 'open') {
       throw new BadRequestException([
         'Deletion failed',
@@ -183,14 +294,26 @@ export class InstanceController {
       ]);
     }
     try {
-      delete this.waMonitor.waInstances[instanceName];
+      if (stateConn.state === 'connecting') {
-      return { error: false, message: 'Instance deleted' };
+        this.logger.verbose('logging out instance: ' + instanceName);
+
+        await this.logout({ instanceName });
+        delete this.waMonitor.waInstances[instanceName];
+        return { error: false, message: 'Instance deleted' };
+      } else {
+        this.logger.verbose('deleting instance: ' + instanceName);
+
+        delete this.waMonitor.waInstances[instanceName];
+        this.eventEmitter.emit('remove.instance', instanceName, 'inner');
+        return { error: false, message: 'Instance deleted' };
+      }
     } catch (error) {
       throw new BadRequestException(error.toString());
     }
   }
 
   public async refreshToken(_: InstanceDto, oldToken: OldToken) {
+    this.logger.verbose('requested refreshToken');
     return await this.authService.refreshToken(oldToken);
   }
 }

src/whatsapp/controllers/sendMessage.controller.ts

@@ -11,22 +11,35 @@ import {
   SendMediaDto,
   SendPollDto,
   SendReactionDto,
+  SendStatusDto,
   SendStickerDto,
   SendTextDto,
 } from '../dto/sendMessage.dto';
 import { WAMonitoringService } from '../services/monitor.service';
 
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('MessageRouter');
+
 export class SendMessageController {
   constructor(private readonly waMonitor: WAMonitoringService) {}
 
   public async sendText({ instanceName }: InstanceDto, data: SendTextDto) {
+    logger.verbose('requested sendText from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].textMessage(data);
   }
 
   public async sendMedia({ instanceName }: InstanceDto, data: SendMediaDto) {
+    logger.verbose('requested sendMedia from ' + instanceName + ' instance');
     if (isBase64(data?.mediaMessage?.media) && !data?.mediaMessage?.fileName) {
       throw new BadRequestException('For bse64 the file name must be informed.');
     }
+    logger.verbose(
+      'isURL: ' +
+        isURL(data?.mediaMessage?.media) +
+        ', isBase64: ' +
+        isBase64(data?.mediaMessage?.media),
+    );
     if (isURL(data?.mediaMessage?.media) || isBase64(data?.mediaMessage?.media)) {
       return await this.waMonitor.waInstances[instanceName].mediaMessage(data);
     }
@@ -34,6 +47,14 @@ export class SendMessageController {
   }
 
   public async sendSticker({ instanceName }: InstanceDto, data: SendStickerDto) {
+    logger.verbose('requested sendSticker from ' + instanceName + ' instance');
+
+    logger.verbose(
+      'isURL: ' +
+        isURL(data?.stickerMessage?.image) +
+        ', isBase64: ' +
+        isBase64(data?.stickerMessage?.image),
+    );
     if (isURL(data.stickerMessage.image) || isBase64(data.stickerMessage.image)) {
       return await this.waMonitor.waInstances[instanceName].mediaSticker(data);
     }
@@ -41,6 +62,14 @@ export class SendMessageController {
   }
 
   public async sendWhatsAppAudio({ instanceName }: InstanceDto, data: SendAudioDto) {
+    logger.verbose('requested sendWhatsAppAudio from ' + instanceName + ' instance');
+
+    logger.verbose(
+      'isURL: ' +
+        isURL(data?.audioMessage?.audio) +
+        ', isBase64: ' +
+        isBase64(data?.audioMessage?.audio),
+    );
     if (isURL(data.audioMessage.audio) || isBase64(data.audioMessage.audio)) {
       return await this.waMonitor.waInstances[instanceName].audioWhatsapp(data);
     }
@@ -48,6 +77,7 @@ export class SendMessageController {
   }
 
   public async sendButtons({ instanceName }: InstanceDto, data: SendButtonDto) {
+    logger.verbose('requested sendButtons from ' + instanceName + ' instance');
     if (
       isBase64(data.buttonMessage.mediaMessage?.media) &&
       !data.buttonMessage.mediaMessage?.fileName
@@ -58,18 +88,22 @@ export class SendMessageController {
   }
 
   public async sendLocation({ instanceName }: InstanceDto, data: SendLocationDto) {
+    logger.verbose('requested sendLocation from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].locationMessage(data);
   }
 
   public async sendList({ instanceName }: InstanceDto, data: SendListDto) {
+    logger.verbose('requested sendList from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].listMessage(data);
   }
 
   public async sendContact({ instanceName }: InstanceDto, data: SendContactDto) {
+    logger.verbose('requested sendContact from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].contactMessage(data);
   }
 
   public async sendReaction({ instanceName }: InstanceDto, data: SendReactionDto) {
+    logger.verbose('requested sendReaction from ' + instanceName + ' instance');
     if (!data.reactionMessage.reaction.match(/[^\(\)\w\sà-ú"-\+]+/)) {
       throw new BadRequestException('"reaction" must be an emoji');
     }
@@ -77,10 +111,17 @@ export class SendMessageController {
   }
 
   public async sendPoll({ instanceName }: InstanceDto, data: SendPollDto) {
+    logger.verbose('requested sendPoll from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].pollMessage(data);
   }
 
+  public async sendStatus({ instanceName }: InstanceDto, data: SendStatusDto) {
+    logger.verbose('requested sendStatus from ' + instanceName + ' instance');
+    return await this.waMonitor.waInstances[instanceName].statusMessage(data);
+  }
+
   public async sendLinkPreview({ instanceName }: InstanceDto, data: SendLinkPreviewDto) {
+    logger.verbose('requested sendLinkPreview from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].linkPreview(data);
   }
 }

src/whatsapp/controllers/webhook.controller.ts

@@ -3,18 +3,31 @@ import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WebhookService } from '../services/webhook.service';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('WebhookController');
 
 export class WebhookController {
   constructor(private readonly webhookService: WebhookService) {}
 
   public async createWebhook(instance: InstanceDto, data: WebhookDto) {
-    if (!isURL(data.url, { require_tld: false })) {
+    logger.verbose('requested createWebhook from ' + instance.instanceName + ' instance');
+
+    if (data.enabled && !isURL(data.url, { require_tld: false })) {
       throw new BadRequestException('Invalid "url" property');
     }
+
+    if (!data.enabled) {
+      logger.verbose('webhook disabled');
+      data.url = '';
+      data.events = [];
+    }
+
     return this.webhookService.create(instance, data);
   }
 
   public async findWebhook(instance: InstanceDto) {
+    logger.verbose('requested findWebhook from ' + instance.instanceName + ' instance');
     return this.webhookService.find(instance);
   }
 }

src/whatsapp/dto/chat.dto.ts

@@ -2,7 +2,8 @@ import {
   WAPrivacyOnlineValue,
   WAPrivacyValue,
   WAReadReceiptsValue,
-} from '@evolution/base';
+  proto,
+} from '@whiskeysockets/baileys';
 
 export class OnWhatsAppDto {
   constructor(
@@ -12,6 +13,11 @@ export class OnWhatsAppDto {
   ) {}
 }
 
+export class getBase64FromMediaMessageDto {
+  message: proto.WebMessageInfo;
+  convertToMp4?: boolean;
+}
+
 export class WhatsAppNumberDto {
   numbers: string[];
 }

src/whatsapp/dto/group.dto.ts

@@ -27,6 +27,12 @@ export class GroupInvite {
   inviteCode: string;
 }
 
+export class GroupSendInvite {
+  groupJid: string;
+  description: string;
+  numbers: string[];
+}
+
 export class GroupUpdateParticipantDto extends GroupJid {
   action: 'add' | 'remove' | 'promote' | 'demote';
   participants: string[];

src/whatsapp/dto/instance.dto.ts

@@ -1,6 +1,7 @@
 export class InstanceDto {
   instanceName: string;
   webhook?: string;
+  webhook_by_events?: boolean;
   events?: string[];
   qrcode?: boolean;
   token?: string;

src/whatsapp/dto/sendMessage.dto.ts

@@ -1,4 +1,4 @@
-import { proto, WAPresence } from '@evolution/base';
+import { proto, WAPresence } from '@whiskeysockets/baileys';
 
 export class Quoted {
   key: proto.IMessageKey;
@@ -32,6 +32,16 @@ class linkPreviewMessage {
   text: string;
 }
 
+export class StatusMessage {
+  type: string;
+  content: string;
+  statusJidList?: string[];
+  allContacts?: boolean;
+  caption?: string;
+  backgroundColor?: string;
+  font?: number;
+}
+
 class PollMessage {
   name: string;
   selectableCount: number;
@@ -46,6 +56,10 @@ export class SendLinkPreviewDto extends Metadata {
   linkPreview: linkPreviewMessage;
 }
 
+export class SendStatusDto extends Metadata {
+  statusMessage: StatusMessage;
+}
+
 export class SendPollDto extends Metadata {
   pollMessage: PollMessage;
 }
@@ -125,6 +139,9 @@ export class ContactMessage {
   fullName: string;
   wuid: string;
   phoneNumber: string;
+  organization?: string;
+  email?: string;
+  url?: string;
 }
 export class SendContactDto extends Metadata {
   contactMessage: ContactMessage[];

src/whatsapp/dto/webhook.dto.ts

@@ -2,4 +2,5 @@ export class WebhookDto {
   enabled?: boolean;
   url?: string;
   events?: string[];
+  webhook_by_events?: boolean;
 }

src/whatsapp/guards/instance.guard.ts

@@ -9,7 +9,7 @@ import {
   NotFoundException,
 } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
-import { waMonitor } from '../whatsapp.module';
+import { cache, waMonitor } from '../whatsapp.module';
 import { Database, Redis, configService } from '../../config/env.config';
 import { RedisCache } from '../../db/redis.client';
 
@@ -20,7 +20,6 @@ async function getInstance(instanceName: string) {
   const exists = !!waMonitor.waInstances[instanceName];
 
   if (redisConf.ENABLED) {
-    const cache = new RedisCache(redisConf, instanceName);
     const keyExists = await cache.keyExists();
     return exists || keyExists;
   }

src/whatsapp/models/message.model.ts

@@ -50,6 +50,7 @@ export class MessageUpdateRaw {
   datetime?: number;
   status?: wa.StatusMessage;
   owner: string;
+  pollUpdates?: any;
 }
 
 const messageUpdateSchema = new Schema<MessageUpdateRaw>({

src/whatsapp/models/webhook.model.ts

@@ -6,6 +6,7 @@ export class WebhookRaw {
   url?: string;
   enabled?: boolean;
   events?: string[];
+  webhook_by_events?: boolean;
 }
 
 const webhookSchema = new Schema<WebhookRaw>({

src/whatsapp/repository/auth.repository.ts

@@ -4,6 +4,7 @@ import { IInsert, Repository } from '../abstract/abstract.repository';
 import { IAuthModel, AuthRaw } from '../models';
 import { readFileSync } from 'fs';
 import { AUTH_DIR } from '../../config/path.config';
+import { Logger } from '../../config/logger.config';
 
 export class AuthRepository extends Repository {
   constructor(
@@ -15,24 +16,35 @@ export class AuthRepository extends Repository {
   }
 
   private readonly auth: Auth;
+  private readonly logger = new Logger('AuthRepository');
 
   public async create(data: AuthRaw, instance: string): Promise<IInsert> {
     try {
+      this.logger.verbose('creating auth');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('saving auth to db');
         const insert = await this.authModel.replaceOne(
           { _id: instance },
           { ...data },
           { upsert: true },
         );
+
+        this.logger.verbose('auth saved to db: ' + insert.modifiedCount + ' auth');
         return { insertCount: insert.modifiedCount };
       }
 
+      this.logger.verbose('saving auth to store');
+
       this.writeStore<AuthRaw>({
         path: join(AUTH_DIR, this.auth.TYPE),
         fileName: instance,
         data,
       });
+      this.logger.verbose(
+        'auth saved to store in path: ' + join(AUTH_DIR, this.auth.TYPE) + '/' + instance,
+      );
 
+      this.logger.verbose('auth created');
       return { insertCount: 1 };
     } catch (error) {
       return { error } as any;
@@ -41,10 +53,14 @@ export class AuthRepository extends Repository {
 
   public async find(instance: string): Promise<AuthRaw> {
     try {
+      this.logger.verbose('finding auth');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding auth in db');
         return await this.authModel.findOne({ _id: instance });
       }
 
+      this.logger.verbose('finding auth in store');
+
       return JSON.parse(
         readFileSync(join(AUTH_DIR, this.auth.TYPE, instance + '.json'), {
           encoding: 'utf-8',

src/whatsapp/repository/chat.repository.ts

@@ -3,6 +3,7 @@ import { ConfigService, StoreConf } from '../../config/env.config';
 import { IInsert, Repository } from '../abstract/abstract.repository';
 import { opendirSync, readFileSync, rmSync } from 'fs';
 import { ChatRaw, IChatModel } from '../models';
+import { Logger } from '../../config/logger.config';
 
 export class ChatQuery {
   where: ChatRaw;
@@ -16,31 +17,54 @@ export class ChatRepository extends Repository {
     super(configService);
   }
 
-  public async insert(data: ChatRaw[], saveDb = false): Promise<IInsert> {
+  private readonly logger = new Logger('ChatRepository');
+
+  public async insert(
+    data: ChatRaw[],
+    instanceName: string,
+    saveDb = false,
+  ): Promise<IInsert> {
+    this.logger.verbose('inserting chats');
     if (data.length === 0) {
+      this.logger.verbose('no chats to insert');
       return;
     }
 
     try {
+      this.logger.verbose('saving chats to store');
       if (this.dbSettings.ENABLED && saveDb) {
+        this.logger.verbose('saving chats to db');
         const insert = await this.chatModel.insertMany([...data]);
+
+        this.logger.verbose('chats saved to db: ' + insert.length + ' chats');
         return { insertCount: insert.length };
       }
 
+      this.logger.verbose('saving chats to store');
+
       const store = this.configService.get<StoreConf>('STORE');
 
       if (store.CHATS) {
+        this.logger.verbose('saving chats to store');
         data.forEach((chat) => {
           this.writeStore<ChatRaw>({
-            path: join(this.storePath, 'chats', chat.owner),
+            path: join(this.storePath, 'chats', instanceName),
             fileName: chat.id,
             data: chat,
           });
+          this.logger.verbose(
+            'chats saved to store in path: ' +
+              join(this.storePath, 'chats', instanceName) +
+              '/' +
+              chat.id,
+          );
         });
 
+        this.logger.verbose('chats saved to store');
         return { insertCount: data.length };
       }
 
+      this.logger.verbose('chats not saved to store');
       return { insertCount: 0 };
     } catch (error) {
       return error;
@@ -51,10 +75,14 @@ export class ChatRepository extends Repository {
 
   public async find(query: ChatQuery): Promise<ChatRaw[]> {
     try {
+      this.logger.verbose('finding chats');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding chats in db');
         return await this.chatModel.find({ owner: query.where.owner });
       }
 
+      this.logger.verbose('finding chats in store');
+
       const chats: ChatRaw[] = [];
       const openDir = opendirSync(join(this.storePath, 'chats', query.where.owner));
       for await (const dirent of openDir) {
@@ -70,6 +98,7 @@ export class ChatRepository extends Repository {
         }
       }
 
+      this.logger.verbose('chats found in store: ' + chats.length + ' chats');
       return chats;
     } catch (error) {
       return [];
@@ -78,10 +107,13 @@ export class ChatRepository extends Repository {
 
   public async delete(query: ChatQuery) {
     try {
+      this.logger.verbose('deleting chats');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('deleting chats in db');
         return await this.chatModel.deleteOne({ ...query.where });
       }
 
+      this.logger.verbose('deleting chats in store');
       rmSync(join(this.storePath, 'chats', query.where.owner, query.where.id + '.josn'), {
         force: true,
         recursive: true,

src/whatsapp/repository/contact.repository.ts

@@ -3,6 +3,7 @@ import { join } from 'path';
 import { ConfigService, StoreConf } from '../../config/env.config';
 import { ContactRaw, IContactModel } from '../models';
 import { IInsert, Repository } from '../abstract/abstract.repository';
+import { Logger } from '../../config/logger.config';
 
 export class ContactQuery {
   where: ContactRaw;
@@ -16,31 +17,121 @@ export class ContactRepository extends Repository {
     super(configService);
   }
 
-  public async insert(data: ContactRaw[], saveDb = false): Promise<IInsert> {
+  private readonly logger = new Logger('ContactRepository');
+
+  public async insert(
+    data: ContactRaw[],
+    instanceName: string,
+    saveDb = false,
+  ): Promise<IInsert> {
+    this.logger.verbose('inserting contacts');
+
     if (data.length === 0) {
+      this.logger.verbose('no contacts to insert');
       return;
     }
 
     try {
       if (this.dbSettings.ENABLED && saveDb) {
+        this.logger.verbose('saving contacts to db');
+
         const insert = await this.contactModel.insertMany([...data]);
+
+        this.logger.verbose('contacts saved to db: ' + insert.length + ' contacts');
         return { insertCount: insert.length };
       }
 
+      this.logger.verbose('saving contacts to store');
+
       const store = this.configService.get<StoreConf>('STORE');
 
       if (store.CONTACTS) {
+        this.logger.verbose('saving contacts to store');
         data.forEach((contact) => {
           this.writeStore({
-            path: join(this.storePath, 'contacts', contact.owner),
+            path: join(this.storePath, 'contacts', instanceName),
             fileName: contact.id,
             data: contact,
           });
+          this.logger.verbose(
+            'contacts saved to store in path: ' +
+              join(this.storePath, 'contacts', instanceName) +
+              '/' +
+              contact.id,
+          );
         });
 
+        this.logger.verbose('contacts saved to store: ' + data.length + ' contacts');
+        return { insertCount: data.length };
+      }
+
+      this.logger.verbose('contacts not saved');
+      return { insertCount: 0 };
+    } catch (error) {
+      return error;
+    } finally {
+      data = undefined;
+    }
+  }
+
+  public async update(
+    data: ContactRaw[],
+    instanceName: string,
+    saveDb = false,
+  ): Promise<IInsert> {
+    try {
+      this.logger.verbose('updating contacts');
+
+      if (data.length === 0) {
+        this.logger.verbose('no contacts to update');
+        return;
+      }
+
+      if (this.dbSettings.ENABLED && saveDb) {
+        this.logger.verbose('updating contacts in db');
+
+        const contacts = data.map((contact) => {
+          return {
+            updateOne: {
+              filter: { id: contact.id },
+              update: { ...contact },
+              upsert: true,
+            },
+          };
+        });
+
+        const { nModified } = await this.contactModel.bulkWrite(contacts);
+
+        this.logger.verbose('contacts updated in db: ' + nModified + ' contacts');
+        return { insertCount: nModified };
+      }
+
+      this.logger.verbose('updating contacts in store');
+
+      const store = this.configService.get<StoreConf>('STORE');
+
+      if (store.CONTACTS) {
+        this.logger.verbose('updating contacts in store');
+        data.forEach((contact) => {
+          this.writeStore({
+            path: join(this.storePath, 'contacts', instanceName),
+            fileName: contact.id,
+            data: contact,
+          });
+          this.logger.verbose(
+            'contacts updated in store in path: ' +
+              join(this.storePath, 'contacts', instanceName) +
+              '/' +
+              contact.id,
+          );
+        });
+
+        this.logger.verbose('contacts updated in store: ' + data.length + ' contacts');
+
         return { insertCount: data.length };
       }
 
+      this.logger.verbose('contacts not updated');
       return { insertCount: 0 };
     } catch (error) {
       return error;
@@ -51,11 +142,16 @@ export class ContactRepository extends Repository {
 
   public async find(query: ContactQuery): Promise<ContactRaw[]> {
     try {
+      this.logger.verbose('finding contacts');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding contacts in db');
         return await this.contactModel.find({ ...query.where });
       }
+
+      this.logger.verbose('finding contacts in store');
       const contacts: ContactRaw[] = [];
       if (query?.where?.id) {
+        this.logger.verbose('finding contacts in store by id');
         contacts.push(
           JSON.parse(
             readFileSync(
@@ -70,6 +166,8 @@ export class ContactRepository extends Repository {
           ),
         );
       } else {
+        this.logger.verbose('finding contacts in store by owner');
+
         const openDir = opendirSync(join(this.storePath, 'contacts', query.where.owner), {
           encoding: 'utf-8',
         });
@@ -86,6 +184,8 @@ export class ContactRepository extends Repository {
           }
         }
       }
+
+      this.logger.verbose('contacts found in store: ' + contacts.length + ' contacts');
       return contacts;
     } catch (error) {
       return [];

src/whatsapp/repository/message.repository.ts

@@ -3,6 +3,7 @@ import { join } from 'path';
 import { IMessageModel, MessageRaw } from '../models';
 import { IInsert, Repository } from '../abstract/abstract.repository';
 import { opendirSync, readFileSync } from 'fs';
+import { Logger } from '../../config/logger.config';
 
 export class MessageQuery {
   where: MessageRaw;
@@ -17,13 +18,23 @@ export class MessageRepository extends Repository {
     super(configService);
   }
 
-  public async insert(data: MessageRaw[], saveDb = false): Promise<IInsert> {
+  private readonly logger = new Logger('MessageRepository');
+
+  public async insert(
+    data: MessageRaw[],
+    instanceName: string,
+    saveDb = false,
+  ): Promise<IInsert> {
+    this.logger.verbose('inserting messages');
+
     if (!Array.isArray(data) || data.length === 0) {
+      this.logger.verbose('no messages to insert');
       return;
     }
 
     try {
       if (this.dbSettings.ENABLED && saveDb) {
+        this.logger.verbose('saving messages to db');
         const cleanedData = data.map((obj) => {
           const cleanedObj = { ...obj };
           if ('extendedTextMessage' in obj.message) {
@@ -44,23 +55,37 @@ export class MessageRepository extends Repository {
         });
 
         const insert = await this.messageModel.insertMany([...cleanedData]);
+
+        this.logger.verbose('messages saved to db: ' + insert.length + ' messages');
         return { insertCount: insert.length };
       }
 
+      this.logger.verbose('saving messages to store');
+
       const store = this.configService.get<StoreConf>('STORE');
 
       if (store.MESSAGES) {
-        data.forEach((msg) =>
+        this.logger.verbose('saving messages to store');
-          this.writeStore<MessageRaw>({
-            path: join(this.storePath, 'messages', msg.owner),
-            fileName: msg.key.id,
-            data: msg,
-          }),
-        );
 
+        data.forEach((message) => {
+          this.writeStore({
+            path: join(this.storePath, 'messages', instanceName),
+            fileName: message.key.id,
+            data: message,
+          });
+          this.logger.verbose(
+            'messages saved to store in path: ' +
+              join(this.storePath, 'messages', instanceName) +
+              '/' +
+              message.key.id,
+          );
+        });
+
+        this.logger.verbose('messages saved to store: ' + data.length + ' messages');
         return { insertCount: data.length };
       }
 
+      this.logger.verbose('messages not saved to store');
       return { insertCount: 0 };
     } catch (error) {
       console.log('ERROR: ', error);
@@ -72,21 +97,26 @@ export class MessageRepository extends Repository {
 
   public async find(query: MessageQuery) {
     try {
+      this.logger.verbose('finding messages');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding messages in db');
         if (query?.where?.key) {
           for (const [k, v] of Object.entries(query.where.key)) {
             query.where['key.' + k] = v;
           }
           delete query?.where?.key;
         }
+
         return await this.messageModel
           .find({ ...query.where })
           .sort({ messageTimestamp: -1 })
           .limit(query?.limit ?? 0);
       }
 
+      this.logger.verbose('finding messages in store');
       const messages: MessageRaw[] = [];
       if (query?.where?.key?.id) {
+        this.logger.verbose('finding messages in store by id');
         messages.push(
           JSON.parse(
             readFileSync(
@@ -101,6 +131,7 @@ export class MessageRepository extends Repository {
           ),
         );
       } else {
+        this.logger.verbose('finding messages in store by owner');
         const openDir = opendirSync(join(this.storePath, 'messages', query.where.owner), {
           encoding: 'utf-8',
         });
@@ -119,6 +150,7 @@ export class MessageRepository extends Repository {
         }
       }
 
+      this.logger.verbose('messages found in store: ' + messages.length + ' messages');
       return messages
         .sort((x, y) => {
           return (y.messageTimestamp as number) - (x.messageTimestamp as number);

src/whatsapp/repository/messageUp.repository.ts

@@ -3,6 +3,7 @@ import { IMessageUpModel, MessageUpdateRaw } from '../models';
 import { IInsert, Repository } from '../abstract/abstract.repository';
 import { join } from 'path';
 import { opendirSync, readFileSync } from 'fs';
+import { Logger } from '../../config/logger.config';
 
 export class MessageUpQuery {
   where: MessageUpdateRaw;
@@ -17,31 +18,54 @@ export class MessageUpRepository extends Repository {
     super(configService);
   }
 
-  public async insert(data: MessageUpdateRaw[], saveDb?: boolean): Promise<IInsert> {
+  private readonly logger = new Logger('MessageUpRepository');
+
+  public async insert(
+    data: MessageUpdateRaw[],
+    instanceName: string,
+    saveDb?: boolean,
+  ): Promise<IInsert> {
+    this.logger.verbose('inserting message up');
+
     if (data.length === 0) {
+      this.logger.verbose('no message up to insert');
       return;
     }
 
     try {
       if (this.dbSettings.ENABLED && saveDb) {
+        this.logger.verbose('saving message up to db');
         const insert = await this.messageUpModel.insertMany([...data]);
+
+        this.logger.verbose('message up saved to db: ' + insert.length + ' message up');
         return { insertCount: insert.length };
       }
 
+      this.logger.verbose('saving message up to store');
+
       const store = this.configService.get<StoreConf>('STORE');
 
       if (store.MESSAGE_UP) {
+        this.logger.verbose('saving message up to store');
         data.forEach((update) => {
           this.writeStore<MessageUpdateRaw>({
-            path: join(this.storePath, 'message-up', update.owner),
+            path: join(this.storePath, 'message-up', instanceName),
             fileName: update.id,
             data: update,
           });
+          this.logger.verbose(
+            'message up saved to store in path: ' +
+              join(this.storePath, 'message-up', instanceName) +
+              '/' +
+              update.id,
+          );
         });
 
+        this.logger.verbose('message up saved to store: ' + data.length + ' message up');
         return { insertCount: data.length };
       }
 
+      this.logger.verbose('message up not saved to store');
       return { insertCount: 0 };
     } catch (error) {
       return error;
@@ -50,15 +74,21 @@ export class MessageUpRepository extends Repository {
 
   public async find(query: MessageUpQuery) {
     try {
+      this.logger.verbose('finding message up');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding message up in db');
         return await this.messageUpModel
           .find({ ...query.where })
           .sort({ datetime: -1 })
           .limit(query?.limit ?? 0);
       }
 
+      this.logger.verbose('finding message up in store');
+
       const messageUpdate: MessageUpdateRaw[] = [];
       if (query?.where?.id) {
+        this.logger.verbose('finding message up in store by id');
+
         messageUpdate.push(
           JSON.parse(
             readFileSync(
@@ -73,6 +103,8 @@ export class MessageUpRepository extends Repository {
           ),
         );
       } else {
+        this.logger.verbose('finding message up in store by owner');
+
         const openDir = opendirSync(
           join(this.storePath, 'message-up', query.where.owner),
           { encoding: 'utf-8' },
@@ -92,6 +124,9 @@ export class MessageUpRepository extends Repository {
         }
       }
 
+      this.logger.verbose(
+        'message up found in store: ' + messageUpdate.length + ' message up',
+      );
       return messageUpdate
         .sort((x, y) => {
           return y.datetime - x.datetime;

src/whatsapp/repository/repository.manager.ts

@@ -5,6 +5,10 @@ import { MessageUpRepository } from './messageUp.repository';
 import { MongoClient } from 'mongodb';
 import { WebhookRepository } from './webhook.repository';
 import { AuthRepository } from './auth.repository';
+import { Auth, ConfigService, Database } from '../../config/env.config';
+import { execSync } from 'child_process';
+import { join } from 'path';
+import { Logger } from '../../config/logger.config';
 
 export class RepositoryBroker {
   constructor(
@@ -14,14 +18,54 @@ export class RepositoryBroker {
     public readonly messageUpdate: MessageUpRepository,
     public readonly webhook: WebhookRepository,
     public readonly auth: AuthRepository,
+    private configService: ConfigService,
     dbServer?: MongoClient,
   ) {
+    this.logger.verbose('initializing repository broker');
     this.dbClient = dbServer;
+    this.__init_repo_without_db__();
   }
 
   private dbClient?: MongoClient;
+  private readonly logger = new Logger('RepositoryBroker');
 
   public get dbServer() {
     return this.dbClient;
   }
+
+  private __init_repo_without_db__() {
+    this.logger.verbose('initializing repository without db');
+    if (!this.configService.get<Database>('DATABASE').ENABLED) {
+      this.logger.verbose('database is disabled');
+
+      const storePath = join(process.cwd(), 'store');
+
+      this.logger.verbose('creating store path: ' + storePath);
+      execSync(
+        `mkdir -p ${join(
+          storePath,
+          'auth',
+          this.configService.get<Auth>('AUTHENTICATION').TYPE,
+        )}`,
+      );
+
+      this.logger.verbose('creating chats path: ' + join(storePath, 'chats'));
+      execSync(`mkdir -p ${join(storePath, 'chats')}`);
+
+      this.logger.verbose('creating contacts path: ' + join(storePath, 'contacts'));
+      execSync(`mkdir -p ${join(storePath, 'contacts')}`);
+
+      this.logger.verbose('creating messages path: ' + join(storePath, 'messages'));
+      execSync(`mkdir -p ${join(storePath, 'messages')}`);
+
+      this.logger.verbose('creating message-up path: ' + join(storePath, 'message-up'));
+      execSync(`mkdir -p ${join(storePath, 'message-up')}`);
+
+      this.logger.verbose('creating webhook path: ' + join(storePath, 'webhook'));
+      execSync(`mkdir -p ${join(storePath, 'webhook')}`);
+
+      this.logger.verbose('creating temp path: ' + join(storePath, 'temp'));
+      execSync(`mkdir -p ${join(storePath, 'temp')}`);
+    }
+  }
 }

src/whatsapp/repository/webhook.repository.ts

@@ -3,6 +3,7 @@ import { ConfigService } from '../../config/env.config';
 import { join } from 'path';
 import { readFileSync } from 'fs';
 import { IWebhookModel, WebhookRaw } from '../models';
+import { Logger } from '../../config/logger.config';
 
 export class WebhookRepository extends Repository {
   constructor(
@@ -12,23 +13,39 @@ export class WebhookRepository extends Repository {
     super(configService);
   }
 
+  private readonly logger = new Logger('WebhookRepository');
+
   public async create(data: WebhookRaw, instance: string): Promise<IInsert> {
     try {
+      this.logger.verbose('creating webhook');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('saving webhook to db');
         const insert = await this.webhookModel.replaceOne(
           { _id: instance },
           { ...data },
           { upsert: true },
         );
+
+        this.logger.verbose('webhook saved to db: ' + insert.modifiedCount + ' webhook');
         return { insertCount: insert.modifiedCount };
       }
 
+      this.logger.verbose('saving webhook to store');
+
       this.writeStore<WebhookRaw>({
         path: join(this.storePath, 'webhook'),
         fileName: instance,
         data,
       });
 
+      this.logger.verbose(
+        'webhook saved to store in path: ' +
+          join(this.storePath, 'webhook') +
+          '/' +
+          instance,
+      );
+
+      this.logger.verbose('webhook created');
       return { insertCount: 1 };
     } catch (error) {
       return error;
@@ -37,10 +54,13 @@ export class WebhookRepository extends Repository {
 
   public async find(instance: string): Promise<WebhookRaw> {
     try {
+      this.logger.verbose('finding webhook');
       if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding webhook in db');
         return await this.webhookModel.findOne({ _id: instance });
       }
 
+      this.logger.verbose('finding webhook in store');
       return JSON.parse(
         readFileSync(join(this.storePath, 'webhook', instance + '.json'), {
           encoding: 'utf-8',

src/whatsapp/routers/chat.router.ts

@@ -22,6 +22,7 @@ import {
   ProfileStatusDto,
   ReadMessageDto,
   WhatsAppNumberDto,
+  getBase64FromMediaMessageDto,
 } from '../dto/chat.dto';
 import { ContactQuery } from '../repository/contact.repository';
 import { MessageQuery } from '../repository/message.repository';
@@ -29,14 +30,24 @@ import { chatController } from '../whatsapp.module';
 import { RouterBroker } from '../abstract/abstract.router';
 import { HttpStatus } from './index.router';
 import { MessageUpQuery } from '../repository/messageUp.repository';
-import { proto } from '@evolution/base';
+import { proto } from '@whiskeysockets/baileys';
 import { InstanceDto } from '../dto/instance.dto';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('ChatRouter');
 
 export class ChatRouter extends RouterBroker {
   constructor(...guards: RequestHandler[]) {
     super();
     this.router
       .post(this.routerPath('whatsappNumbers'), ...guards, async (req, res) => {
+        logger.verbose('request received in whatsappNumbers');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<WhatsAppNumberDto>({
           request: req,
           schema: whatsappNumberSchema,
@@ -47,6 +58,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('markMessageAsRead'), ...guards, async (req, res) => {
+        logger.verbose('request received in markMessageAsRead');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ReadMessageDto>({
           request: req,
           schema: readMessageSchema,
@@ -57,6 +75,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('archiveChat'), ...guards, async (req, res) => {
+        logger.verbose('request received in archiveChat');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ArchiveChatDto>({
           request: req,
           schema: archiveChatSchema,
@@ -70,6 +95,13 @@ export class ChatRouter extends RouterBroker {
         this.routerPath('deleteMessageForEveryone'),
         ...guards,
         async (req, res) => {
+          logger.verbose('request received in deleteMessageForEveryone');
+          logger.verbose('request body: ');
+          logger.verbose(req.body);
+
+          logger.verbose('request query: ');
+          logger.verbose(req.query);
+
           const response = await this.dataValidate<DeleteMessage>({
             request: req,
             schema: deleteMessageSchema,
@@ -81,6 +113,13 @@ export class ChatRouter extends RouterBroker {
         },
       )
       .post(this.routerPath('fetchProfilePictureUrl'), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchProfilePictureUrl');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<NumberDto>({
           request: req,
           schema: profilePictureSchema,
@@ -91,6 +130,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .post(this.routerPath('findContacts'), ...guards, async (req, res) => {
+        logger.verbose('request received in findContacts');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ContactQuery>({
           request: req,
           schema: contactValidateSchema,
@@ -101,10 +147,17 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .post(this.routerPath('getBase64FromMediaMessage'), ...guards, async (req, res) => {
-        const response = await this.dataValidate<proto.IWebMessageInfo>({
+        logger.verbose('request received in getBase64FromMediaMessage');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
+        const response = await this.dataValidate<getBase64FromMediaMessageDto>({
           request: req,
           schema: null,
-          ClassRef: Object,
+          ClassRef: getBase64FromMediaMessageDto,
           execute: (instance, data) =>
             chatController.getBase64FromMediaMessage(instance, data),
         });
@@ -112,6 +165,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('findMessages'), ...guards, async (req, res) => {
+        logger.verbose('request received in findMessages');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<MessageQuery>({
           request: req,
           schema: messageValidateSchema,
@@ -122,6 +182,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .post(this.routerPath('findStatusMessage'), ...guards, async (req, res) => {
+        logger.verbose('request received in findStatusMessage');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<MessageUpQuery>({
           request: req,
           schema: messageUpSchema,
@@ -132,6 +199,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('findChats'), ...guards, async (req, res) => {
+        logger.verbose('request received in findChats');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: null,
@@ -143,6 +217,13 @@ export class ChatRouter extends RouterBroker {
       })
       // Profile routes
       .get(this.routerPath('fetchPrivacySettings'), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchPrivacySettings');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: null,
@@ -153,6 +234,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .put(this.routerPath('updatePrivacySettings'), ...guards, async (req, res) => {
+        logger.verbose('request received in updatePrivacySettings');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<PrivacySettingDto>({
           request: req,
           schema: privacySettingsSchema,
@@ -164,6 +252,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('fetchBusinessProfile'), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchBusinessProfile');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ProfilePictureDto>({
           request: req,
           schema: profilePictureSchema,
@@ -175,6 +270,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .post(this.routerPath('updateProfileName'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateProfileName');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ProfileNameDto>({
           request: req,
           schema: profileNameSchema,
@@ -185,6 +287,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .post(this.routerPath('updateProfileStatus'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateProfileStatus');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ProfileStatusDto>({
           request: req,
           schema: profileStatusSchema,
@@ -195,6 +304,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .put(this.routerPath('updateProfilePicture'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateProfilePicture');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ProfilePictureDto>({
           request: req,
           schema: profilePictureSchema,
@@ -206,6 +322,13 @@ export class ChatRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .delete(this.routerPath('removeProfilePicture'), ...guards, async (req, res) => {
+        logger.verbose('request received in removeProfilePicture');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.dataValidate<ProfilePictureDto>({
           request: req,
           schema: profilePictureSchema,

src/whatsapp/routers/group.router.ts

@@ -9,6 +9,7 @@ import {
   updateGroupSubjectSchema,
   updateGroupDescriptionSchema,
   groupInviteSchema,
+  groupSendInviteSchema,
 } from '../../validate/validate.schema';
 import { RouterBroker } from '../abstract/abstract.router';
 import {
@@ -21,15 +22,25 @@ import {
   GroupUpdateParticipantDto,
   GroupUpdateSettingDto,
   GroupToggleEphemeralDto,
+  GroupSendInvite,
 } from '../dto/group.dto';
 import { groupController } from '../whatsapp.module';
 import { HttpStatus } from './index.router';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('GroupRouter');
 
 export class GroupRouter extends RouterBroker {
   constructor(...guards: RequestHandler[]) {
     super();
     this.router
       .post(this.routerPath('create'), ...guards, async (req, res) => {
+        logger.verbose('request received in createGroup');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<CreateGroupDto>({
           request: req,
           schema: createGroupSchema,
@@ -40,6 +51,13 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('updateGroupSubject'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateGroupSubject');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
         const response = await this.groupValidate<GroupSubjectDto>({
           request: req,
           schema: updateGroupSubjectSchema,
@@ -50,6 +68,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('updateGroupPicture'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateGroupPicture');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupPictureDto>({
           request: req,
           schema: updateGroupPictureSchema,
@@ -60,6 +84,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('updateGroupDescription'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateGroupDescription');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupDescriptionDto>({
           request: req,
           schema: updateGroupDescriptionSchema,
@@ -71,6 +101,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .get(this.routerPath('findGroupInfos'), ...guards, async (req, res) => {
+        logger.verbose('request received in findGroupInfos');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupJid>({
           request: req,
           schema: groupJidSchema,
@@ -81,6 +117,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('fetchAllGroups'), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchAllGroups');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupNoValidate<GroupJid>({
           request: req,
           schema: {},
@@ -91,6 +133,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('participants'), ...guards, async (req, res) => {
+        logger.verbose('request received in participants');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupJid>({
           request: req,
           schema: groupJidSchema,
@@ -101,6 +149,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('inviteCode'), ...guards, async (req, res) => {
+        logger.verbose('request received in inviteCode');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupJid>({
           request: req,
           schema: groupJidSchema,
@@ -111,6 +165,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('inviteInfo'), ...guards, async (req, res) => {
+        logger.verbose('request received in inviteInfo');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.inviteCodeValidate<GroupInvite>({
           request: req,
           schema: groupInviteSchema,
@@ -120,17 +180,29 @@ export class GroupRouter extends RouterBroker {
 
         res.status(HttpStatus.OK).json(response);
       })
-      .get(this.routerPath('acceptInvite'), ...guards, async (req, res) => {
+      .post(this.routerPath('sendInvite'), ...guards, async (req, res) => {
-        const response = await this.inviteCodeValidate<GroupInvite>({
+        logger.verbose('request received in sendInvite');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.groupNoValidate<GroupSendInvite>({
           request: req,
-          schema: groupInviteSchema,
+          schema: groupSendInviteSchema,
-          ClassRef: GroupInvite,
+          ClassRef: GroupSendInvite,
-          execute: (instance, data) => groupController.acceptInvite(instance, data),
+          execute: (instance, data) => groupController.sendInvite(instance, data),
         });
 
         res.status(HttpStatus.OK).json(response);
       })
       .put(this.routerPath('revokeInviteCode'), ...guards, async (req, res) => {
+        logger.verbose('request received in revokeInviteCode');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupJid>({
           request: req,
           schema: groupJidSchema,
@@ -141,6 +213,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('updateParticipant'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateParticipant');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupUpdateParticipantDto>({
           request: req,
           schema: updateParticipantsSchema,
@@ -151,6 +229,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('updateSetting'), ...guards, async (req, res) => {
+        logger.verbose('request received in updateSetting');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupUpdateSettingDto>({
           request: req,
           schema: updateSettingsSchema,
@@ -161,6 +245,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .put(this.routerPath('toggleEphemeral'), ...guards, async (req, res) => {
+        logger.verbose('request received in toggleEphemeral');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupToggleEphemeralDto>({
           request: req,
           schema: toggleEphemeralSchema,
@@ -171,6 +261,12 @@ export class GroupRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .delete(this.routerPath('leaveGroup'), ...guards, async (req, res) => {
+        logger.verbose('request received in leaveGroup');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.groupValidate<GroupJid>({
           request: req,
           schema: {},

src/whatsapp/routers/instance.router.ts

@@ -7,6 +7,9 @@ import { HttpStatus } from './index.router';
 import { OldToken } from '../services/auth.service';
 import { Auth, ConfigService, Database } from '../../config/env.config';
 import { dbserver } from '../../db/db.connect';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('InstanceRouter');
 
 export class InstanceRouter extends RouterBroker {
   constructor(readonly configService: ConfigService, ...guards: RequestHandler[]) {
@@ -14,6 +17,12 @@ export class InstanceRouter extends RouterBroker {
     const auth = configService.get<Auth>('AUTHENTICATION');
     this.router
       .post('/create', ...guards, async (req, res) => {
+        logger.verbose('request received in createInstance');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
@@ -23,7 +32,29 @@ export class InstanceRouter extends RouterBroker {
 
         return res.status(HttpStatus.CREATED).json(response);
       })
+      .put(this.routerPath('restart'), ...guards, async (req, res) => {
+        logger.verbose('request received in restartInstance');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.dataValidate<InstanceDto>({
+          request: req,
+          schema: instanceNameSchema,
+          ClassRef: InstanceDto,
+          execute: (instance) => instanceController.restartInstance(instance),
+        });
+
+        return res.status(HttpStatus.OK).json(response);
+      })
       .get(this.routerPath('connect'), ...guards, async (req, res) => {
+        logger.verbose('request received in connectInstance');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
@@ -34,6 +65,12 @@ export class InstanceRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('connectionState'), ...guards, async (req, res) => {
+        logger.verbose('request received in connectionState');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
@@ -44,6 +81,12 @@ export class InstanceRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .get(this.routerPath('fetchInstances', false), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchInstances');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: null,
@@ -54,6 +97,12 @@ export class InstanceRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .delete(this.routerPath('logout'), ...guards, async (req, res) => {
+        logger.verbose('request received in logoutInstances');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
@@ -64,6 +113,12 @@ export class InstanceRouter extends RouterBroker {
         return res.status(HttpStatus.OK).json(response);
       })
       .delete(this.routerPath('delete'), ...guards, async (req, res) => {
+        logger.verbose('request received in deleteInstances');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,
@@ -76,6 +131,12 @@ export class InstanceRouter extends RouterBroker {
 
     if (auth.TYPE === 'jwt') {
       this.router.put('/refreshToken', async (req, res) => {
+        logger.verbose('request received in refreshToken');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<OldToken>({
           request: req,
           schema: oldTokenSchema,
@@ -88,6 +149,12 @@ export class InstanceRouter extends RouterBroker {
     }
 
     this.router.delete('/deleteDatabase', async (req, res) => {
+      logger.verbose('request received in deleteDatabase');
+      logger.verbose('request body: ');
+      logger.verbose(req.body);
+
+      logger.verbose('request query: ');
+      logger.verbose(req.query);
       const db = this.configService.get<Database>('DATABASE');
       if (db.ENABLED) {
         try {

src/whatsapp/routers/sendMessage.router.ts

@@ -9,6 +9,7 @@ import {
   mediaMessageSchema,
   pollMessageSchema,
   reactionMessageSchema,
+  statusMessageSchema,
   stickerMessageSchema,
   textMessageSchema,
 } from '../../validate/validate.schema';
@@ -22,18 +23,28 @@ import {
   SendMediaDto,
   SendPollDto,
   SendReactionDto,
+  SendStatusDto,
   SendStickerDto,
   SendTextDto,
 } from '../dto/sendMessage.dto';
 import { sendMessageController } from '../whatsapp.module';
 import { RouterBroker } from '../abstract/abstract.router';
 import { HttpStatus } from './index.router';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('MessageRouter');
 
 export class MessageRouter extends RouterBroker {
   constructor(...guards: RequestHandler[]) {
     super();
     this.router
       .post(this.routerPath('sendText'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendText');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendTextDto>({
           request: req,
           schema: textMessageSchema,
@@ -44,6 +55,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendMedia'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendMedia');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendMediaDto>({
           request: req,
           schema: mediaMessageSchema,
@@ -54,6 +71,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendWhatsAppAudio'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendWhatsAppAudio');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendAudioDto>({
           request: req,
           schema: audioMessageSchema,
@@ -65,6 +88,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendButtons'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendButtons');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendButtonDto>({
           request: req,
           schema: buttonMessageSchema,
@@ -75,6 +104,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendLocation'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendLocation');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendLocationDto>({
           request: req,
           schema: locationMessageSchema,
@@ -85,6 +120,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendList'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendList');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendListDto>({
           request: req,
           schema: listMessageSchema,
@@ -95,6 +136,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendContact'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendContact');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendContactDto>({
           request: req,
           schema: contactMessageSchema,
@@ -105,6 +152,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendReaction'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendReaction');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendReactionDto>({
           request: req,
           schema: reactionMessageSchema,
@@ -115,6 +168,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendPoll'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendPoll');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendPollDto>({
           request: req,
           schema: pollMessageSchema,
@@ -124,7 +183,29 @@ export class MessageRouter extends RouterBroker {
 
         return res.status(HttpStatus.CREATED).json(response);
       })
+      .post(this.routerPath('sendStatus'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendStatus');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.dataValidate<SendStatusDto>({
+          request: req,
+          schema: statusMessageSchema,
+          ClassRef: SendStatusDto,
+          execute: (instance, data) => sendMessageController.sendStatus(instance, data),
+        });
+
+        return res.status(HttpStatus.CREATED).json(response);
+      })
       .post(this.routerPath('sendLinkPreview'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendLinkPreview');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendLinkPreviewDto>({
           request: req,
           schema: linkPreviewSchema,
@@ -136,6 +217,12 @@ export class MessageRouter extends RouterBroker {
         return res.status(HttpStatus.CREATED).json(response);
       })
       .post(this.routerPath('sendSticker'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendSticker');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<SendStickerDto>({
           request: req,
           schema: stickerMessageSchema,

src/whatsapp/routers/webhook.router.ts

@@ -5,12 +5,21 @@ import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { webhookController } from '../whatsapp.module';
 import { HttpStatus } from './index.router';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('WebhookRouter');
 
 export class WebhookRouter extends RouterBroker {
   constructor(...guards: RequestHandler[]) {
     super();
     this.router
       .post(this.routerPath('set'), ...guards, async (req, res) => {
+        logger.verbose('request received in setWebhook');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<WebhookDto>({
           request: req,
           schema: webhookSchema,
@@ -21,6 +30,12 @@ export class WebhookRouter extends RouterBroker {
         res.status(HttpStatus.CREATED).json(response);
       })
       .get(this.routerPath('find'), ...guards, async (req, res) => {
+        logger.verbose('request received in findWebhook');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,

src/whatsapp/services/auth.service.ts

@@ -43,8 +43,12 @@ export class AuthService {
       { expiresIn: jwtOpts.EXPIRIN_IN, encoding: 'utf8', subject: 'g-t' },
     );
 
+    this.logger.verbose('JWT token created: ' + token);
+
     const auth = await this.repository.auth.create({ jwt: token }, instance.instanceName);
 
+    this.logger.verbose('JWT token saved in database');
+
     if (auth['error']) {
       this.logger.error({
         localError: AuthService.name + '.jwt',
@@ -59,8 +63,14 @@ export class AuthService {
   private async apikey(instance: InstanceDto, token?: string) {
     const apikey = token ? token : v4().toUpperCase();
 
+    this.logger.verbose(
+      token ? 'APIKEY defined: ' + apikey : 'APIKEY created: ' + apikey,
+    );
+
     const auth = await this.repository.auth.create({ apikey }, instance.instanceName);
 
+    this.logger.verbose('APIKEY saved in database');
+
     if (auth['error']) {
       this.logger.error({
         localError: AuthService.name + '.apikey',
@@ -72,45 +82,80 @@ export class AuthService {
     return { apikey };
   }
 
+  public async checkDuplicateToken(token: string) {
+    const instances = await this.waMonitor.instanceInfo();
+
+    this.logger.verbose('checking duplicate token');
+
+    const instance = instances.find((instance) => instance.instance.apikey === token);
+
+    if (instance) {
+      throw new BadRequestException('Token already exists');
+    }
+
+    this.logger.verbose('available token');
+
+    return true;
+  }
+
   public async generateHash(instance: InstanceDto, token?: string) {
     const options = this.configService.get<Auth>('AUTHENTICATION');
+
+    this.logger.verbose(
+      'generating hash ' + options.TYPE + ' to instance: ' + instance.instanceName,
+    );
+
     return (await this[options.TYPE](instance, token)) as
       | { jwt: string }
       | { apikey: string };
   }
 
   public async refreshToken({ oldToken }: OldToken) {
+    this.logger.verbose('refreshing token');
+
     if (!isJWT(oldToken)) {
       throw new BadRequestException('Invalid "oldToken"');
     }
 
     try {
       const jwtOpts = this.configService.get<Auth>('AUTHENTICATION').JWT;
+
+      this.logger.verbose('checking oldToken');
+
       const decode = verify(oldToken, jwtOpts.SECRET, {
         ignoreExpiration: true,
       }) as Pick<JwtPayload, 'apiName' | 'instanceName' | 'tokenId'>;
 
+      this.logger.verbose('checking token in database');
+
       const tokenStore = await this.repository.auth.find(decode.instanceName);
 
       const decodeTokenStore = verify(tokenStore.jwt, jwtOpts.SECRET, {
         ignoreExpiration: true,
       }) as Pick<JwtPayload, 'apiName' | 'instanceName' | 'tokenId'>;
 
+      this.logger.verbose('checking tokenId');
+
       if (decode.tokenId !== decodeTokenStore.tokenId) {
         throw new BadRequestException('Invalid "oldToken"');
       }
 
+      this.logger.verbose('generating new token');
+
       const token = {
         jwt: (await this.jwt({ instanceName: decode.instanceName })).jwt,
         instanceName: decode.instanceName,
       };
 
       try {
+        this.logger.verbose('checking webhook');
         const webhook = await this.repository.webhook.find(decode.instanceName);
         if (
           webhook?.enabled &&
           this.configService.get<Webhook>('WEBHOOK').EVENTS.NEW_JWT_TOKEN
         ) {
+          this.logger.verbose('sending webhook');
+
           const httpService = axios.create({ baseURL: webhook.url });
           await httpService.post(
             '',
@@ -126,6 +171,8 @@ export class AuthService {
         this.logger.error(error);
       }
 
+      this.logger.verbose('token refreshed');
+
       return token;
     } catch (error) {
       this.logger.error({

src/whatsapp/services/monitor.service.ts

@@ -1,6 +1,6 @@
 import { opendirSync, readdirSync, rmSync } from 'fs';
 import { WAStartupService } from './whatsapp.service';
-import { INSTANCE_DIR } from '../../config/path.config';
+import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
 import EventEmitter2 from 'eventemitter2';
 import { join } from 'path';
 import { Logger } from '../../config/logger.config';
@@ -14,16 +14,19 @@ import {
 import { RepositoryBroker } from '../repository/repository.manager';
 import { NotFoundException } from '../../exceptions';
 import { Db } from 'mongodb';
-import { RedisCache } from '../../db/redis.client';
 import { initInstance } from '../whatsapp.module';
-import { ValidationError } from 'class-validator';
+import { RedisCache } from '../../db/redis.client';
+import { execSync } from 'child_process';
 
 export class WAMonitoringService {
   constructor(
     private readonly eventEmitter: EventEmitter2,
     private readonly configService: ConfigService,
     private readonly repository: RepositoryBroker,
+    private readonly cache: RedisCache,
   ) {
+    this.logger.verbose('instance created');
+
     this.removeInstance();
     this.noConnection();
     this.delInstanceFiles();
@@ -34,15 +37,12 @@ export class WAMonitoringService {
     this.dbInstance = this.db.ENABLED
       ? this.repository.dbServer?.db(this.db.CONNECTION.DB_PREFIX_NAME + '-instances')
       : undefined;
-
-    this.redisCache = this.redis.ENABLED ? new RedisCache(this.redis) : undefined;
   }
 
   private readonly db: Partial<Database> = {};
   private readonly redis: Partial<Redis> = {};
 
   private dbInstance: Db;
-  private redisCache: RedisCache;
 
   private readonly logger = new Logger(WAMonitoringService.name);
   public readonly waInstances: Record<string, WAStartupService> = {};
@@ -50,15 +50,30 @@ export class WAMonitoringService {
   public delInstanceTime(instance: string) {
     const time = this.configService.get<DelInstance>('DEL_INSTANCE');
     if (typeof time === 'number' && time > 0) {
-      setTimeout(() => {
+      this.logger.verbose(
+        `Instance "${instance}" don't have connection, will be removed in ${time} minutes`,
+      );
+
+      setTimeout(async () => {
         if (this.waInstances[instance]?.connectionStatus?.state !== 'open') {
-          delete this.waInstances[instance];
+          if (this.waInstances[instance]?.connectionStatus?.state === 'connecting') {
+            await this.waInstances[instance]?.client?.logout(
+              'Log out instance: ' + instance,
+            );
+            this.waInstances[instance]?.client?.ws?.close();
+            this.waInstances[instance]?.client?.end(undefined);
+            delete this.waInstances[instance];
+          } else {
+            delete this.waInstances[instance];
+            this.eventEmitter.emit('remove.instance', instance, 'inner');
+          }
         }
       }, 1000 * 60 * time);
     }
   }
 
   public async instanceInfo(instanceName?: string) {
+    this.logger.verbose('get instance info');
     if (instanceName && !this.waInstances[instanceName]) {
       throw new NotFoundException(`Instance "${instanceName}" not found`);
     }
@@ -67,9 +82,14 @@ export class WAMonitoringService {
 
     for await (const [key, value] of Object.entries(this.waInstances)) {
       if (value) {
+        this.logger.verbose('get instance info: ' + key);
         if (value.connectionStatus.state === 'open') {
+          this.logger.verbose('instance: ' + key + ' - connectionStatus: open');
           let apikey: string;
           if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
+            this.logger.verbose(
+              'instance: ' + key + ' - hash exposed in fetch instances',
+            );
             const tokenStore = await this.repository.auth.find(key);
             apikey = tokenStore.apikey || 'Apikey not found';
 
@@ -84,6 +104,9 @@ export class WAMonitoringService {
               },
             });
           } else {
+            this.logger.verbose(
+              'instance: ' + key + ' - hash not exposed in fetch instances',
+            );
             instances.push({
               instance: {
                 instanceName: key,
@@ -95,8 +118,14 @@ export class WAMonitoringService {
             });
           }
         } else {
+          this.logger.verbose(
+            'instance: ' + key + ' - connectionStatus: ' + value.connectionStatus.state,
+          );
           let apikey: string;
           if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
+            this.logger.verbose(
+              'instance: ' + key + ' - hash exposed in fetch instances',
+            );
             const tokenStore = await this.repository.auth.find(key);
             apikey = tokenStore.apikey || 'Apikey not found';
 
@@ -108,6 +137,9 @@ export class WAMonitoringService {
               },
             });
           } else {
+            this.logger.verbose(
+              'instance: ' + key + ' - hash not exposed in fetch instances',
+            );
             instances.push({
               instance: {
                 instanceName: key,
@@ -119,10 +151,13 @@ export class WAMonitoringService {
       }
     }
 
+    this.logger.verbose('return instance info: ' + instances.length);
+
     return instances.find((i) => i.instance.instanceName === instanceName) ?? instances;
   }
 
   private delInstanceFiles() {
+    this.logger.verbose('cron to delete instance files started');
     setInterval(async () => {
       if (this.db.ENABLED && this.db.SAVE_DATA.INSTANCE) {
         const collections = await this.dbInstance.collections();
@@ -134,7 +169,9 @@ export class WAMonitoringService {
               { _id: { $regex: /^session-.*/ } },
             ],
           });
+          this.logger.verbose('instance files deleted: ' + name);
         });
+      } else if (this.redis.ENABLED) {
       } else {
         const dir = opendirSync(INSTANCE_DIR, { encoding: 'utf-8' });
         for await (const dirent of dir) {
@@ -150,14 +187,17 @@ export class WAMonitoringService {
                 });
               }
             });
+            this.logger.verbose('instance files deleted: ' + dirent.name);
           }
         }
       }
     }, 3600 * 1000 * 2);
   }
 
-  private async cleaningUp(instanceName: string) {
+  public async cleaningUp(instanceName: string) {
+    this.logger.verbose('cleaning up instance: ' + instanceName);
     if (this.db.ENABLED && this.db.SAVE_DATA.INSTANCE) {
+      this.logger.verbose('cleaning up instance in database: ' + instanceName);
       await this.repository.dbServer.connect();
       const collections: any[] = await this.dbInstance.collections();
       if (collections.length > 0) {
@@ -167,52 +207,88 @@ export class WAMonitoringService {
     }
 
     if (this.redis.ENABLED) {
-      this.redisCache.reference = instanceName;
+      this.logger.verbose('cleaning up instance in redis: ' + instanceName);
-      await this.redisCache.delAll();
+      this.cache.reference = instanceName;
+      await this.cache.delAll();
       return;
     }
+
+    this.logger.verbose('cleaning up instance in files: ' + instanceName);
     rmSync(join(INSTANCE_DIR, instanceName), { recursive: true, force: true });
   }
 
+  public async cleaningStoreFiles(instanceName: string) {
+    this.logger.verbose('cleaning store files instance: ' + instanceName);
+
+    if (!this.db.ENABLED) {
+      const instance = this.waInstances[instanceName];
+
+      rmSync(join(INSTANCE_DIR, instanceName), { recursive: true, force: true });
+
+      execSync(`rm -rf ${join(STORE_DIR, 'chats', instanceName)}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'contacts', instanceName)}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'message-up', instanceName)}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'messages', instanceName)}`);
+
+      execSync(`rm -rf ${join(STORE_DIR, 'auth', 'apikey', instanceName + '.json')}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'webhook', instanceName + '.json')}`);
+    }
+  }
+
   public async loadInstance() {
+    this.logger.verbose('load instances');
     const set = async (name: string) => {
       const instance = new WAStartupService(
         this.configService,
         this.eventEmitter,
         this.repository,
+        this.cache,
       );
       instance.instanceName = name;
+      this.logger.verbose('instance loaded: ' + name);
+
       await instance.connectToWhatsapp();
+      this.logger.verbose('connectToWhatsapp: ' + name);
+
       this.waInstances[name] = instance;
     };
 
     try {
       if (this.redis.ENABLED) {
-        const keys = await this.redisCache.instanceKeys();
+        this.logger.verbose('redis enabled');
+        await this.cache.connect(this.redis as Redis);
+        const keys = await this.cache.instanceKeys();
         if (keys?.length > 0) {
+          this.logger.verbose('reading instance keys and setting instances');
           keys.forEach(async (k) => await set(k.split(':')[1]));
         } else {
+          this.logger.verbose('no instance keys found');
           initInstance();
         }
         return;
       }
 
       if (this.db.ENABLED && this.db.SAVE_DATA.INSTANCE) {
+        this.logger.verbose('database enabled');
         await this.repository.dbServer.connect();
         const collections: any[] = await this.dbInstance.collections();
         if (collections.length > 0) {
+          this.logger.verbose('reading collections and setting instances');
           collections.forEach(
             async (coll) => await set(coll.namespace.replace(/^[\w-]+\./, '')),
           );
         } else {
+          this.logger.verbose('no collections found');
           initInstance();
         }
         return;
       }
 
+      this.logger.verbose('store in files enabled');
       const dir = opendirSync(INSTANCE_DIR, { encoding: 'utf-8' });
       for await (const dirent of dir) {
         if (dirent.isDirectory()) {
+          this.logger.verbose('reading instance files and setting instances');
           const files = readdirSync(join(INSTANCE_DIR, dirent.name), {
             encoding: 'utf-8',
           });
@@ -223,6 +299,7 @@ export class WAMonitoringService {
 
           await set(dirent.name);
         } else {
+          this.logger.verbose('no instance files found');
           initInstance();
         }
       }
@@ -233,22 +310,39 @@ export class WAMonitoringService {
 
   private removeInstance() {
     this.eventEmitter.on('remove.instance', async (instanceName: string) => {
+      this.logger.verbose('remove instance: ' + instanceName);
       try {
+        this.logger.verbose('instance: ' + instanceName + ' - removing from memory');
         this.waInstances[instanceName] = undefined;
       } catch {}
 
       try {
+        this.logger.verbose('request cleaning up instance: ' + instanceName);
         this.cleaningUp(instanceName);
+        this.cleaningStoreFiles(instanceName);
       } finally {
         this.logger.warn(`Instance "${instanceName}" - REMOVED`);
       }
     });
+    this.eventEmitter.on('logout.instance', async (instanceName: string) => {
+      this.logger.verbose('logout instance: ' + instanceName);
+      try {
+        this.logger.verbose('request cleaning up instance: ' + instanceName);
+        this.cleaningUp(instanceName);
+      } finally {
+        this.logger.warn(`Instance "${instanceName}" - LOGOUT`);
+      }
+    });
   }
 
   private noConnection() {
+    this.logger.verbose('checking instances without connection');
     this.eventEmitter.on('no.connection', async (instanceName) => {
       try {
+        this.logger.verbose('instance: ' + instanceName + ' - removing from memory');
         this.waInstances[instanceName] = undefined;
+
+        this.logger.verbose('request cleaning up instance: ' + instanceName);
         this.cleaningUp(instanceName);
       } catch (error) {
         this.logger.error({

src/whatsapp/services/webhook.service.ts

@@ -1,11 +1,15 @@
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WAMonitoringService } from './monitor.service';
+import { Logger } from '../../config/logger.config';
 
 export class WebhookService {
   constructor(private readonly waMonitor: WAMonitoringService) {}
 
+  private readonly logger = new Logger(WebhookService.name);
+
   public create(instance: InstanceDto, data: WebhookDto) {
+    this.logger.verbose('create webhook: ' + instance.instanceName);
     this.waMonitor.waInstances[instance.instanceName].setWebhook(data);
 
     return { webhook: { ...instance, webhook: data } };
@@ -13,6 +17,7 @@ export class WebhookService {
 
   public async find(instance: InstanceDto): Promise<WebhookDto> {
     try {
+      this.logger.verbose('find webhook: ' + instance.instanceName);
       return await this.waMonitor.waInstances[instance.instanceName].findWebhook();
     } catch (error) {
       return { enabled: null, url: '' };

src/whatsapp/types/wa.types.ts

@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/no-namespace */
-import { AuthenticationState, WAConnectionState } from '@evolution/base';
+import { AuthenticationState, WAConnectionState } from '@whiskeysockets/baileys';
 
 export enum Events {
   APPLICATION_STARTUP = 'application.startup',
   QRCODE_UPDATED = 'qrcode.updated',
   CONNECTION_UPDATE = 'connection.update',
   STATUS_INSTANCE = 'status.instance',
+  SEND_MESSAGE = 'send.message',
   MESSAGES_SET = 'messages.set',
   MESSAGES_UPSERT = 'messages.upsert',
   MESSAGES_UPDATE = 'messages.update',
-  SEND_MESSAGE = 'send.message',
   CONTACTS_SET = 'contacts.set',
   CONTACTS_UPSERT = 'contacts.upsert',
   CONTACTS_UPDATE = 'contacts.update',
@@ -34,7 +34,12 @@ export declare namespace wa {
     profilePictureUrl?: string;
   };
 
-  export type LocalWebHook = { enabled?: boolean; url?: string; events?: string[] };
+  export type LocalWebHook = {
+    enabled?: boolean;
+    url?: string;
+    events?: string[];
+    webhook_by_events?: boolean;
+  };
 
   export type StateConnection = {
     instance?: string;

src/whatsapp/whatsapp.module.ts

@@ -27,8 +27,9 @@ import { WebhookRepository } from './repository/webhook.repository';
 import { WebhookModel } from './models/webhook.model';
 import { AuthRepository } from './repository/auth.repository';
 import { WAStartupService } from './services/whatsapp.service';
-import { delay } from '@evolution/base';
+import { delay } from '@whiskeysockets/baileys';
 import { Events } from './types/wa.types';
+import { RedisCache } from '../db/redis.client';
 
 const logger = new Logger('WA MODULE');
 
@@ -46,10 +47,18 @@ export const repository = new RepositoryBroker(
   messageUpdateRepository,
   webhookRepository,
   authRepository,
+  configService,
   dbserver?.getClient(),
 );
 
-export const waMonitor = new WAMonitoringService(eventEmitter, configService, repository);
+export const cache = new RedisCache();
+
+export const waMonitor = new WAMonitoringService(
+  eventEmitter,
+  configService,
+  repository,
+  cache,
+);
 
 const authService = new AuthService(configService, waMonitor, repository);
 
@@ -64,6 +73,7 @@ export const instanceController = new InstanceController(
   eventEmitter,
   authService,
   webhookService,
+  cache,
 );
 export const viewsController = new ViewsController(waMonitor, configService);
 export const sendMessageController = new SendMessageController(waMonitor);
@@ -71,10 +81,11 @@ export const chatController = new ChatController(waMonitor);
 export const groupController = new GroupController(waMonitor);
 
 export async function initInstance() {
-  const instance = new WAStartupService(configService, eventEmitter, repository);
+  const instance = new WAStartupService(configService, eventEmitter, repository, cache);
 
   const mode = configService.get<Auth>('AUTHENTICATION').INSTANCE.MODE;
 
+  logger.verbose('Sending data webhook for event: ' + Events.APPLICATION_STARTUP);
   instance.sendDataWebhook(
     Events.APPLICATION_STARTUP,
     {
@@ -85,9 +96,14 @@ export async function initInstance() {
   );
 
   if (mode === 'container') {
+    logger.verbose('Application startup in container mode');
+
     const instanceName = configService.get<Auth>('AUTHENTICATION').INSTANCE.NAME;
+    logger.verbose('Instance name: ' + instanceName);
+
     const instanceWebhook =
       configService.get<Auth>('AUTHENTICATION').INSTANCE.WEBHOOK_URL;
+    logger.verbose('Instance webhook: ' + instanceWebhook);
 
     instance.instanceName = instanceName;
 
@@ -96,13 +112,17 @@ export async function initInstance() {
 
     const hash = await authService.generateHash({
       instanceName: instance.instanceName,
+      token: configService.get<Auth>('AUTHENTICATION').API_KEY.KEY,
     });
+    logger.verbose('Hash generated: ' + hash);
 
     if (instanceWebhook) {
+      logger.verbose('Creating webhook for instance: ' + instanceName);
       try {
         webhookService.create(instance, { enabled: true, url: instanceWebhook });
+        logger.verbose('Webhook created');
       } catch (error) {
-        this.logger.log(error);
+        logger.log(error);
       }
     }
 
@@ -120,7 +140,7 @@ export async function initInstance() {
           return await this.connectionState({ instanceName });
       }
     } catch (error) {
-      this.logger.log(error);
+      logger.log(error);
     }
 
     const result = {