Merge branch 'release/1.3.1'

* Adjust in create store files

CHANGELOG.md

@@ -1,3 +1,89 @@
+# 1.3.1 (2023-07-20 07:48)
+
+### Fixed
+
+* Adjust in create store files
+
+# 1.3.0 (2023-07-19 11:33)
+
+### Features
+
+* Added messages.delete event
+* Added restart instance endpoint
+* Created automation for creating instances in the chatwoot bot with the command '#inbox_whatsapp:<INSTANCE_NAME>'
+* Change Baileys version to: 6.4.0
+* Send contact in chatwoot
+* Send contact array in chatwoot
+* Added apiKey in webhook and serverUrl in fetchInstance if EXPOSE_IN_FETCH_INSTANCES: true
+* Translation set to default (english) in chatwoot
+
+### Fixed
+ 
+* Fixed error to send message in large groups
+* Docker files adjusted
+* Fixed in the postman collection the webhookByEvent parameter by webhook_by_events
+* Added validations in create instance
+* Removed link preview endpoint, now it's done automatically from sending conventional text
+* Added group membership validation before sending message to groups
+* Adjusts in docker files
+* Adjusts in returns in endpoints chatwoot and webhook
+* Fixed ghost mentions in send text message
+* Fixed bug that saved contacts from groups came without number in chatwoot
+* Fixed problem to receive csat in chatwoot
+* Fixed require fileName for document only in base64 for send media message
+* Bug fix when sending mobile message change contact name to number in chatwoot
+* Bug fix when connecting whatsapp does not send confirmation message
+* Fixed quoted message with id or message directly
+* Adjust in validation for mexican and argentine numbers
+* Adjust in create store files
+
+### Integrations
+
+- Chatwoot: v2.18.0
+
+# 1.2.2 (2023-07-15 09:36)
+
+### Fixed
+
+* Tweak in route "/" with version info
+* Adjusts chatwoot version
+
+### Integrations
+
+- Chatwoot: v2.18.0
+
+# 1.2.1 (2023-07-14 19:04)
+
+### Fixed
+
+* Adjusts in docker files
+* Save picture url groups in chatwoot
+
+# 1.2.0 (2023-07-14 15:28)
+
+### Features
+
+* Native integration with chatwoot
+* Added returning or non-returning participants option in fetchAllGroups
+* Added group integration to chatwoot
+* Added automation on create instance to chatwoot
+* Added verbose logs and format chatwoot service
+
+### Fixed
+
+* Adjusts in docker-compose files
+* Adjusts in number validation for AR and MX numbers
+* Adjusts in env files, removed save old_messages
+* Fix when sending a message to a group I don't belong returns a bad request
+* Fits the format on return from the fetchAllGroups endpoint
+* Adjust in send document with caption from chatwoot
+* Fixed message with undefind in chatwoot
+* Changed message in path /
+* Test duplicate message media in groups chatwoot
+* Optimize send message from group with mentions
+* Fixed name of the profile status in fetchInstances
+* Fixed error 500 when logout in instance with status = close
+
 # 1.1.5 (2023-07-12 07:17)
 
 ### Fixed

Docker/.env.example

@@ -1,11 +1,16 @@
-CORS_ORIGIN='*' # Or separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
+# Server URL - Set your application url
+SERVER_URL='http://localhost:8080'
+
+# Cors - * for all or set separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
+CORS_ORIGIN='*'
 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"
+# Log Baileys - "fatal" | "error" | "warn" | "info" | "debug" | "trace"
+LOG_BAILEYS=error
 
 # Determine how long the instance should be deleted from memory in case of no connection.
 # Default time: 5 minutes
@@ -18,7 +23,8 @@ STORE_MESSAGE_UP=true
 STORE_CONTACTS=true
 STORE_CHATS=true
 
-CLEAN_STORE_CLEANING_INTERVAL=7200 # seconds === 2h
+# Set Store Interval in Seconds (7200 = 2h)
+CLEAN_STORE_CLEANING_INTERVAL=7200
 CLEAN_STORE_MESSAGES=true
 CLEAN_STORE_MESSAGE_UP=true
 CLEAN_STORE_CONTACTS=true
@@ -31,7 +37,6 @@ 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
@@ -41,9 +46,10 @@ REDIS_ENABLED=false
 REDIS_URI=redis://redis:6379
 REDIS_PREFIX_KEY=evolution
 
-# Webhook Settings
+# Global Webhook Settings
+# Each instance's Webhook URL and events will be requested at the time it is created
 ## Define a global webhook that will listen for enabled events from all instances
-WEBHOOK_GLOBAL_URL='<url>'
+WEBHOOK_GLOBAL_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
@@ -53,6 +59,8 @@ WEBHOOK_EVENTS_QRCODE_UPDATED=true
 WEBHOOK_EVENTS_MESSAGES_SET=true
 WEBHOOK_EVENTS_MESSAGES_UPSERT=true
 WEBHOOK_EVENTS_MESSAGES_UPDATE=true
+WEBHOOK_EVENTS_MESSAGES_DELETE=true
+WEBHOOK_EVENTS_SEND_MESSAGE=true
 WEBHOOK_EVENTS_CONTACTS_SET=true
 WEBHOOK_EVENTS_CONTACTS_UPSERT=true
 WEBHOOK_EVENTS_CONTACTS_UPDATE=true
@@ -70,23 +78,32 @@ 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
+# Browser Name = chrome | firefox | edge | opera | safari
+CONFIG_SESSION_PHONE_NAME=chrome
 
 # Set qrcode display limit
 QRCODE_LIMIT=30
 
 # Defines an authentication type for the api
-AUTHENTICATION_TYPE='apikey' # jwt or 'apikey'
+# We recommend using the apikey because it will allow you to use a custom token,
+# if you use jwt, a random token will be generated and may be expired and you will have to generate a new token
+# jwt or 'apikey'
+AUTHENTICATION_TYPE='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
+# seconds - 3600s ===1h | zero (0) - never expires
+AUTHENTICATION_JWT_EXPIRIN_IN=0
 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
+# container or server
+AUTHENTICATION_INSTANCE_MODE=server
 # if you are using container mode, set the container name and the webhook url to default instance
 AUTHENTICATION_INSTANCE_NAME=evolution
-AUTHENTICATION_INSTANCE_WEBHOOK_URL='<url>'
+AUTHENTICATION_INSTANCE_WEBHOOK_URL=''
+AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID=1
+AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN=123456
+AUTHENTICATION_INSTANCE_CHATWOOT_URL=''

Docker/mongodb/docker-compose.yaml

@@ -1,27 +1,41 @@
 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_USERNAME=root
-      MONGO_INITDB_ROOT_PASSWORD: root
+      - MONGO_INITDB_ROOT_PASSWORD=root
-    networks:
+      - PUID=1000
-      - evolution-net
+      - PGID=1000
+    volumes:
+      - evolution_mongodb_data:/data/db
+      - evolution_mongodb_configdb:/data/configdb
     expose:
       - 27017
 
+  mongo-express:
+    image: mongo-express
+    environment:
+      ME_CONFIG_BASICAUTH_USERNAME: root
+      ME_CONFIG_BASICAUTH_PASSWORD: root
+      ME_CONFIG_MONGODB_SERVER: mongodb
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: root
+    ports:
+      - 8081:8081
+    links:
+      - mongodb
+
 volumes:
   evolution_mongodb_data:
   evolution_mongodb_configdb:
+
+networks:
+  evolution-net:
+    external: true
+    

Docker/redis/docker-compose.yaml

@@ -1,17 +1,28 @@
 version: '3.3'
 
-networks:
-  evolution-net:
-    driver: bridge
-
 services:
   redis:
     image: redis:latest
     container_name: redis
+    command: >
+      redis-server
+      --port 6379
+      --appendonly yes
+    volumes:
+      - evolution_redis:/data
     ports:
       - 6379:6379
-    networks:
+  
-      - evolution-net
+  rebrow:
+    image: marian/rebrow
+    ports: 
+      - 5001:5001
+    links:
+      - redis
     
 volumes:
   evolution_redis:
+
+networks:
+  evolution-net:
+    external: true

Dockerfile

@@ -13,82 +13,90 @@ COPY ./package.json .
 
 ENV DOCKER_ENV=true
 
-ENV SERVER_TYPE="http"
+ENV SERVER_URL='http://localhost:8080'
-ENV SERVER_PORT=8080
 
-ENV CORS_ORIGIN="*"
+ENV CORS_ORIGIN=*
-ENV CORS_METHODS="POST,GET,PUT,DELETE"
+ENV CORS_METHODS=POST,GET,PUT,DELETE
 ENV CORS_CREDENTIALS=true
 
-ENV LOG_LEVEL=$LOG_LEVEL
+ENV LOG_LEVEL=ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS
-ENV LOG_COLOR=$LOG_COLOR
+ENV LOG_COLOR=true
+ENV LOG_BAILEYS=error
 
-ENV DEL_INSTANCE=$DEL_INSTANCE
+ENV DEL_INSTANCE=false
 
-ENV STORE_MESSAGES=$STORE_MESSAGE
+ENV STORE_MESSAGES=true
-ENV STORE_MESSAGE_UP=$STORE_MESSAGE_UP
+ENV STORE_MESSAGE_UP=true
-ENV STORE_CONTACTS=$STORE_CONTACTS
+ENV STORE_CONTACTS=true
-ENV STORE_CHATS=$STORE_CHATS
+ENV STORE_CHATS=true
 
-ENV CLEAN_STORE_CLEANING_INTERVAL=$CLEAN_STORE_CLEANING_INTERVAL
+ENV CLEAN_STORE_CLEANING_INTERVAL=7200
-ENV CLEAN_STORE_MESSAGES=$CLEAN_STORE_MESSAGE
+ENV CLEAN_STORE_MESSAGES=true
-ENV CLEAN_STORE_MESSAGE_UP=$CLEAN_STORE_MESSAGE_UP
+ENV CLEAN_STORE_MESSAGE_UP=true
-ENV CLEAN_STORE_CONTACTS=$CLEAN_STORE_CONTACTS
+ENV CLEAN_STORE_CONTACTS=true
-ENV CLEAN_STORE_CHATS=$CLEAN_STORE_CHATS
+ENV CLEAN_STORE_CHATS=true
 
-ENV DATABASE_ENABLED=$DATABASE_ENABLED
+ENV DATABASE_ENABLED=false
-ENV DATABASE_CONNECTION_URI=$DATABASE_CONNECTION_URI
+ENV DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true
-ENV DATABASE_CONNECTION_DB_PREFIX_NAME=$DATABASE_CONNECTION_DB_PREFIX_NAME
+ENV DATABASE_CONNECTION_DB_PREFIX_NAME=evolution
-ENV DATABASE_SAVE_DATA_INSTANCE=$DATABASE_SAVE_DATA_INSTANCE
-ENV DATABASE_SAVE_DATA_OLD_MESSAGE=$DATABASE_SAVE_DATA_OLD_MESSAGE
-ENV DATABASE_SAVE_DATA_NEW_MESSAGE=$DATABASE_SAVE_DATA_NEW_MESSAGE
-ENV DATABASE_SAVE_MESSAGE_UPDATE=$DATABASE_SAVE_MESSAGE_UPDATE
-ENV DATABASE_SAVE_DATA_CONTACTS=$DATABASE_SAVE_DATA_CONTACTS
-ENV DATABASE_SAVE_DATA_CHATS=$DATABASE_SAVE_DATA_CHATS
 
-ENV REDIS_ENABLED=$REDIS_ENABLED
+ENV DATABASE_SAVE_DATA_INSTANCE=false
-ENV REDIS_URI=$REDIS_URI
+ENV DATABASE_SAVE_DATA_NEW_MESSAGE=false
-ENV REDIS_PREFIX_KEY=$REDIS_PREFIX_KEY
+ENV DATABASE_SAVE_MESSAGE_UPDATE=false
+ENV DATABASE_SAVE_DATA_CONTACTS=false
+ENV DATABASE_SAVE_DATA_CHATS=false
 
-ENV WEBHOOK_GLOBAL_URL=$WEBHOOK_GLOBAL_URL
+ENV REDIS_ENABLED=false
-ENV WEBHOOK_GLOBAL_ENABLED=$WEBHOOK_GLOBAL_ENABLED
+ENV REDIS_URI=redis://redis:6379
-ENV WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=$WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS
+ENV REDIS_PREFIX_KEY=evolution
 
-ENV WEBHOOK_EVENTS_APPLICATION_STARTUP=$WEBHOOK_EVENTS_APPLICATION_STARTUP
+ENV WEBHOOK_GLOBAL_URL=<url>
-ENV WEBHOOK_EVENTS_QRCODE_UPDATED=$WEBHOOK_EVENTS_QRCODE_UPDATED
+ENV WEBHOOK_GLOBAL_ENABLED=false
-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_CONTACTS_SET=$WEBHOOK_EVENTS_CONTACTS_SET
-ENV WEBHOOK_EVENTS_CONTACTS_UPSERT=$WEBHOOK_EVENTS_CONTACTS_UPSERT
-ENV WEBHOOK_EVENTS_CONTACTS_UPDATE=$WEBHOOK_EVENTS_CONTACTS_UPDATE
-ENV WEBHOOK_EVENTS_PRESENCE_UPDATE=$WEBHOOK_EVENTS_PRESENCE_UPDATE
-ENV WEBHOOK_EVENTS_CHATS_SET=$WEBHOOK_EVENTS_CHATS_SET
-ENV WEBHOOK_EVENTS_CHATS_UPSERT=$WEBHOOK_EVENTS_CHATS_UPSERT
-ENV WEBHOOK_EVENTS_CHATS_UPDATE=$WEBHOOK_EVENTS_CHATS_UPDATE
-ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=$WEBHOOK_EVENTS_CONNECTION_UPDATE
-ENV WEBHOOK_EVENTS_GROUPS_UPSERT=$WEBHOOK_EVENTS_GROUPS_UPSERT
-ENV WEBHOOK_EVENTS_GROUPS_UPDATE=$WEBHOOK_EVENTS_GROUPS_UPDATE
-ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=$WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE
 
-ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=$WEBHOOK_EVENTS_NEW_JWT_TOKEN
+ENV WEBHOOK_GLOBAL_WEBHOOK_BY_EVENTS=false
 
-ENV CONFIG_SESSION_PHONE_CLIENT=$CONFIG_SESSION_PHONE_CLIENT
+ENV WEBHOOK_EVENTS_APPLICATION_STARTUP=false
-ENV CONFIG_SESSION_PHONE_NAME=$CONFIG_SESSION_PHONE_NAME
+ENV WEBHOOK_EVENTS_QRCODE_UPDATED=true
+ENV WEBHOOK_EVENTS_MESSAGES_SET=true
+ENV WEBHOOK_EVENTS_MESSAGES_UPSERT=true
+ENV WEBHOOK_EVENTS_MESSAGES_UPDATE=true
+ENV WEBHOOK_EVENTS_MESSAGES_DELETE=true
+ENV WEBHOOK_EVENTS_SEND_MESSAGE=true
+ENV WEBHOOK_EVENTS_CONTACTS_SET=true
+ENV WEBHOOK_EVENTS_CONTACTS_UPSERT=true
+ENV WEBHOOK_EVENTS_CONTACTS_UPDATE=true
+ENV WEBHOOK_EVENTS_PRESENCE_UPDATE=true
+ENV WEBHOOK_EVENTS_CHATS_SET=true
+ENV WEBHOOK_EVENTS_CHATS_UPSERT=true
+ENV WEBHOOK_EVENTS_CHATS_UPDATE=true
+ENV WEBHOOK_EVENTS_CHATS_DELETE=true
+ENV WEBHOOK_EVENTS_GROUPS_UPSERT=true
+ENV WEBHOOK_EVENTS_GROUPS_UPDATE=true
+ENV WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
+ENV WEBHOOK_EVENTS_CONNECTION_UPDATE=true
 
-ENV QRCODE_LIMIT=$QRCODE_LIMIT
+ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 
-ENV AUTHENTICATION_TYPE=$AUTHENTICATION_TYPE
+ENV CONFIG_SESSION_PHONE_CLIENT='Evolution API'
+ENV CONFIG_SESSION_PHONE_NAME=chrome
 
-ENV AUTHENTICATION_API_KEY=$AUTHENTICATION_API_KEY
+ENV QRCODE_LIMIT=30
-ENV AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=$AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES
 
-ENV AUTHENTICATION_JWT_EXPIRIN_IN=$AUTHENTICATION_JWT_EXPIRIN_IN
+ENV AUTHENTICATION_TYPE=apikey
-ENV AUTHENTICATION_JWT_SECRET="L=0YWt]b2w[WF>#>:&E`"
 
-ENV AUTHENTICATION_INSTANCE_NAME=$AUTHENTICATION_INSTANCE_NAME
+ENV AUTHENTICATION_API_KEY=B6D711FCDE4D4FD5936544120E713976
-ENV AUTHENTICATION_INSTANCE_WEBHOOK_URL=$AUTHENTICATION_INSTANCE_WEBHOOK_URL
+ENV AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
-ENV AUTHENTICATION_INSTANCE_MODE=$AUTHENTICATION_INSTANCE_MODE
+
+ENV AUTHENTICATION_JWT_EXPIRIN_IN=0
+ENV AUTHENTICATION_JWT_SECRET='L=0YWt]b2w[WF>#>:&E`'
+
+ENV AUTHENTICATION_INSTANCE_MODE=server
+
+ENV AUTHENTICATION_INSTANCE_NAME=evolution
+ENV AUTHENTICATION_INSTANCE_WEBHOOK_URL=<url>
+ENV AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID=1
+ENV AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN=123456
+ENV AUTHENTICATION_INSTANCE_CHATWOOT_URL=<url>
 
 RUN npm install
 

docker-compose.yaml

@@ -1,9 +1,5 @@
 version: '3.3'
 
-networks:
-  evolution-net:
-    driver: bridge
-
 services:
   api:
     container_name: evolution_api
@@ -17,11 +13,14 @@ services:
     env_file:
       - ./Docker/.env
     command: ['node', './dist/src/main.js']
-    networks:
-      - evolution-net
     expose:
       - 8080
 
 volumes:
   evolution_instances:
   evolution_store:
+
+networks:
+  evolution-net:
+    external: true
+  

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.1.4",
+  "version": "1.3.1",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -42,8 +42,10 @@
   "dependencies": {
     "@adiwajshing/keyed-db": "^0.2.4",
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
+    "@figuro/chatwoot-sdk": "^1.1.14",
     "@hapi/boom": "^10.0.1",
-    "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
+    "@sentry/node": "^7.59.2",
+    "@whiskeysockets/baileys": "^6.4.0",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
     "compression": "^1.7.4",

src/config/env.config.ts

@@ -1,10 +1,9 @@
 import { readFileSync } from 'fs';
 import { load } from 'js-yaml';
 import { join } from 'path';
-import { SRC_DIR } from './path.config';
 import { isBooleanString } from 'class-validator';
 
-export type HttpServer = { TYPE: 'http' | 'https'; PORT: number };
+export type HttpServer = { TYPE: 'http' | 'https'; PORT: number; URL: string };
 
 export type HttpMethods = 'POST' | 'GET' | 'PUT' | 'DELETE';
 export type Cors = {
@@ -33,7 +32,6 @@ export type Log = {
 
 export type SaveData = {
   INSTANCE: boolean;
-  OLD_MESSAGE: boolean;
   NEW_MESSAGE: boolean;
   MESSAGE_UPDATE: boolean;
   CONTACTS: boolean;
@@ -77,6 +75,8 @@ export type EventsWebhook = {
   MESSAGES_SET: boolean;
   MESSAGES_UPSERT: boolean;
   MESSAGES_UPDATE: boolean;
+  MESSAGES_DELETE: boolean;
+  SEND_MESSAGE: boolean;
   CONTACTS_SET: boolean;
   CONTACTS_UPDATE: boolean;
   CONTACTS_UPSERT: boolean;
@@ -98,6 +98,9 @@ export type Instance = {
   NAME: string;
   WEBHOOK_URL: string;
   MODE: string;
+  CHATWOOT_ACCOUNT_ID: string;
+  CHATWOOT_TOKEN: string;
+  CHATWOOT_URL: string;
 };
 export type Auth = {
   API_KEY: ApiKey;
@@ -170,6 +173,7 @@ export class ConfigService {
       SERVER: {
         TYPE: process.env.SERVER_TYPE as 'http' | 'https',
         PORT: Number.parseInt(process.env.SERVER_PORT),
+        URL: process.env.SERVER_URL,
       },
       CORS: {
         ORIGIN: process.env.CORS_ORIGIN.split(','),
@@ -189,7 +193,7 @@ export class ConfigService {
       CLEAN_STORE: {
         CLEANING_INTERVAL: Number.isInteger(process.env?.CLEAN_STORE_CLEANING_TERMINAL)
           ? Number.parseInt(process.env.CLEAN_STORE_CLEANING_TERMINAL)
-          : undefined,
+          : 7200,
         MESSAGES: process.env?.CLEAN_STORE_MESSAGES === 'true',
         MESSAGE_UP: process.env?.CLEAN_STORE_MESSAGE_UP === 'true',
         CONTACTS: process.env?.CLEAN_STORE_CONTACTS === 'true',
@@ -203,7 +207,6 @@ export class ConfigService {
         ENABLED: process.env?.DATABASE_ENABLED === 'true',
         SAVE_DATA: {
           INSTANCE: process.env?.DATABASE_SAVE_DATA_INSTANCE === 'true',
-          OLD_MESSAGE: process.env?.DATABASE_SAVE_DATA_OLD_MESSAGE === 'true',
           NEW_MESSAGE: process.env?.DATABASE_SAVE_DATA_NEW_MESSAGE === 'true',
           MESSAGE_UPDATE: process.env?.DATABASE_SAVE_MESSAGE_UPDATE === 'true',
           CONTACTS: process.env?.DATABASE_SAVE_DATA_CONTACTS === 'true',
@@ -222,7 +225,7 @@ export class ConfigService {
       },
       DEL_INSTANCE: isBooleanString(process.env?.DEL_INSTANCE)
         ? process.env.DEL_INSTANCE === 'true'
-        : Number.parseInt(process.env.DEL_INSTANCE),
+        : Number.parseInt(process.env.DEL_INSTANCE) || false,
       WEBHOOK: {
         GLOBAL: {
           URL: process.env?.WEBHOOK_GLOBAL_URL,
@@ -235,6 +238,8 @@ 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',
+          MESSAGES_DELETE: process.env?.WEBHOOK_EVENTS_MESSAGES_DELETE === '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',
@@ -252,11 +257,11 @@ export class ConfigService {
         },
       },
       CONFIG_SESSION_PHONE: {
-        CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT,
+        CLIENT: process.env?.CONFIG_SESSION_PHONE_CLIENT || 'Evolution API',
-        NAME: process.env?.CONFIG_SESSION_PHONE_NAME,
+        NAME: process.env?.CONFIG_SESSION_PHONE_NAME || 'chrome',
       },
       QRCODE: {
-        LIMIT: Number.parseInt(process.env.QRCODE_LIMIT),
+        LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30,
       },
       AUTHENTICATION: {
         TYPE: process.env.AUTHENTICATION_TYPE as 'jwt',
@@ -275,6 +280,10 @@ export class ConfigService {
           NAME: process.env.AUTHENTICATION_INSTANCE_NAME,
           WEBHOOK_URL: process.env.AUTHENTICATION_INSTANCE_WEBHOOK_URL,
           MODE: process.env.AUTHENTICATION_INSTANCE_MODE,
+          CHATWOOT_ACCOUNT_ID:
+            process.env.AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID || '',
+          CHATWOOT_TOKEN: process.env.AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN || '',
+          CHATWOOT_URL: process.env.AUTHENTICATION_INSTANCE_CHATWOOT_URL || '',
         },
       },
     };

src/dev-env.yml

@@ -8,10 +8,11 @@
 SERVER:
   TYPE: http # https
   PORT: 8080 # 443
+  URL: localhost
 
 CORS:
   ORIGIN:
-    - '*'
+    - "*"
     # - yourdomain.com
   METHODS:
     - POST
@@ -38,7 +39,7 @@ LOG:
     - DARK
     - WEBHOOKS
   COLOR: true
-  BAILEYS: error # "fatal" | "error" | "warn" | "info" | "debug" | "trace"
+  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
@@ -63,12 +64,11 @@ CLEAN_STORE:
 DATABASE:
   ENABLED: false
   CONNECTION:
-    URI: 'mongodb://root:root@localhost:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true'
+    URI: "mongodb://root:root@localhost:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true"
     DB_PREFIX_NAME: evolution
   # Choose the data you want to save in the application's database or store
   SAVE_DATA:
     INSTANCE: false
-    OLD_MESSAGE: false
     NEW_MESSAGE: false
     MESSAGE_UPDATE: false
     CONTACTS: false
@@ -76,10 +76,11 @@ DATABASE:
 
 REDIS:
   ENABLED: false
-  URI: 'redis://localhost:6379'
+  URI: "redis://localhost:6379"
-  PREFIX_KEY: 'evolution'
+  PREFIX_KEY: "evolution"
 
-# Webhook Settings
+# Global Webhook Settings
+# Each instance's Webhook URL and events will be requested at the time it is created
 WEBHOOK:
   # Define a global webhook that will listen for enabled events from all instances
   GLOBAL:
@@ -95,6 +96,8 @@ WEBHOOK:
     MESSAGES_SET: true
     MESSAGES_UPSERT: true
     MESSAGES_UPDATE: true
+    MESSAGES_DELETE: true
+    SEND_MESSAGE: true
     CONTACTS_SET: true
     CONTACTS_UPSERT: true
     CONTACTS_UPDATE: true
@@ -112,7 +115,7 @@ WEBHOOK:
 
 CONFIG_SESSION_PHONE:
   # Name that will be displayed on smartphone connection
-  CLIENT: 'Evolution API'
+  CLIENT: "Evolution API"
   NAME: chrome # chrome | firefox | edge | opera | safari
 
 # Set qrcode display limit
@@ -120,6 +123,8 @@ QRCODE:
   LIMIT: 30
 
 # Defines an authentication type for the api
+# We recommend using the apikey because it will allow you to use a custom token,
+# if you use jwt, a random token will be generated and may be expired and you will have to generate a new token
 AUTHENTICATION:
   TYPE: apikey # jwt or apikey
   # Define a global apikey to access all instances
@@ -134,8 +139,11 @@ AUTHENTICATION:
     SECRET: L=0YWt]b2w[WF>#>:&E`
   # 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
+    # With this option activated, you work with a url per webhook event, respecting the local url and the name of each event
     MODE: server # container or server
     # if you are using container mode, set the container name and the webhook url to default instance
     NAME: evolution
     WEBHOOK_URL: <url>
+    CHATWOOT_ACCOUNT_ID: 1
+    CHATWOOT_TOKEN: 123456
+    CHATWOOT_URL: <url>

src/main.ts

@@ -10,6 +10,7 @@ import { waMonitor } from './whatsapp/whatsapp.module';
 import { HttpStatus, router } from './whatsapp/routers/index.router';
 import 'express-async-errors';
 import { ServerUP } from './utils/server-up';
+import * as Sentry from '@sentry/node';
 
 function initWA() {
   waMonitor.loadInstance();
@@ -19,6 +20,27 @@ function bootstrap() {
   const logger = new Logger('SERVER');
   const app = express();
 
+  // Sentry.init({
+  //   dsn: '',
+  //   integrations: [
+  //     // enable HTTP calls tracing
+  //     new Sentry.Integrations.Http({ tracing: true }),
+  //     // enable Express.js middleware tracing
+  //     new Sentry.Integrations.Express({ app }),
+  //     // Automatically instrument Node.js libraries and frameworks
+  //     ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
+  //   ],
+
+  //   // Set tracesSampleRate to 1.0 to capture 100%
+  //   // of transactions for performance monitoring.
+  //   // We recommend adjusting this value in production
+  //   tracesSampleRate: 1.0,
+  // });
+
+  // app.use(Sentry.Handlers.requestHandler());
+
+  // app.use(Sentry.Handlers.tracingHandler());
+
   app.use(
     cors({
       origin(requestOrigin, callback) {
@@ -43,6 +65,13 @@ function bootstrap() {
 
   app.use('/', router);
 
+  // app.use(Sentry.Handlers.errorHandler());
+
+  // app.use(function onError(err, req, res, next) {
+  //   res.statusCode = 500;
+  //   res.end(res.sentry + '\n');
+  // });
+
   app.use(
     (err: Error, req: Request, res: Response, next: NextFunction) => {
       if (err) {

src/validate/validate.schema.ts

@@ -39,6 +39,8 @@ export const instanceNameSchema: JSONSchema7 = {
           'MESSAGES_SET',
           'MESSAGES_UPSERT',
           'MESSAGES_UPDATE',
+          'MESSAGES_DELETE',
+          'SEND_MESSAGE',
           'CONTACTS_SET',
           'CONTACTS_UPSERT',
           'CONTACTS_UPDATE',
@@ -80,8 +82,8 @@ const quotedOptionsSchema: JSONSchema7 = {
         remoteJid: { type: 'string' },
         fromMe: { type: 'boolean', enum: [true, false] },
       },
-      required: ['id', 'remoteJid', 'fromMe'],
+      required: ['id'],
-      ...isNotEmpty('id', 'remoteJid'),
+      ...isNotEmpty('id'),
     },
     message: { type: 'object' },
   },
@@ -143,24 +145,6 @@ export const textMessageSchema: JSONSchema7 = {
   required: ['textMessage', 'number'],
 };
 
-export const linkPreviewSchema: JSONSchema7 = {
-  $id: v4(),
-  type: 'object',
-  properties: {
-    number: { ...numberDefinition },
-    options: { ...optionsSchema },
-    linkPreview: {
-      type: 'object',
-      properties: {
-        text: { type: 'string' },
-      },
-      required: ['text'],
-      ...isNotEmpty('text'),
-    },
-  },
-  required: ['linkPreview', 'number'],
-};
-
 export const pollMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
@@ -699,6 +683,16 @@ export const groupJidSchema: JSONSchema7 = {
   ...isNotEmpty('groupJid'),
 };
 
+export const getParticipantsSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    getParticipants: { type: 'string', enum: ['true', 'false'] },
+  },
+  required: ['getParticipants'],
+  ...isNotEmpty('getParticipants'),
+};
+
 export const groupSendInviteSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
@@ -835,6 +829,8 @@ export const webhookSchema: JSONSchema7 = {
           'MESSAGES_SET',
           'MESSAGES_UPSERT',
           'MESSAGES_UPDATE',
+          'MESSAGES_DELETE',
+          'SEND_MESSAGE',
           'CONTACTS_SET',
           'CONTACTS_UPSERT',
           'CONTACTS_UPDATE',
@@ -855,3 +851,17 @@ export const webhookSchema: JSONSchema7 = {
   required: ['url', 'enabled'],
   ...isNotEmpty('url'),
 };
+
+export const chatwootSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    enabled: { type: 'boolean', enum: [true, false] },
+    account_id: { type: 'string' },
+    token: { type: 'string' },
+    url: { type: 'string' },
+    sign_msg: { type: 'boolean', enum: [true, false] },
+  },
+  required: ['enabled', 'account_id', 'token', 'url', 'sign_msg'],
+  ...isNotEmpty('account_id', 'token', 'url', 'sign_msg'),
+};

src/whatsapp/abstract/abstract.router.ts

@@ -5,7 +5,7 @@ import { validate } from 'jsonschema';
 import { BadRequestException } from '../../exceptions';
 import 'express-async-errors';
 import { Logger } from '../../config/logger.config';
-import { GroupInvite, GroupJid } from '../dto/group.dto';
+import { GetParticipant, GroupInvite, GroupJid } from '../dto/group.dto';
 
 type DataValidate<T> = {
   request: Request;
@@ -160,7 +160,46 @@ export abstract class RouterBroker {
 
     const v = validate(ref, schema);
 
-    console.log(v, '@checkei aqui');
+    if (!v.valid) {
+      const message: any[] = v.errors.map(({ property, stack, schema }) => {
+        let message: string;
+        if (schema['description']) {
+          message = schema['description'];
+        } else {
+          message = stack.replace('instance.', '');
+        }
+        return {
+          property: property.replace('instance.', ''),
+          message,
+        };
+      });
+      logger.error([...message]);
+      throw new BadRequestException(...message);
+    }
+
+    return await execute(instance, ref);
+  }
+
+  public async getParticipantsValidate<T>(args: DataValidate<T>) {
+    const { request, ClassRef, schema, execute } = args;
+
+    const getParticipants = request.query as unknown as GetParticipant;
+
+    if (!getParticipants?.getParticipants) {
+      throw new BadRequestException(
+        'The getParticipants needs to be informed in the query',
+      );
+    }
+
+    const instance = request.params as unknown as InstanceDto;
+    const body = request.body;
+
+    const ref = new ClassRef();
+
+    Object.assign(body, getParticipants);
+    Object.assign(ref, body);
+
+    const v = validate(ref, schema);
 
     if (!v.valid) {
       const message: any[] = v.errors.map(({ property, stack, schema }) => {

src/whatsapp/controllers/chatwoot.controller.ts

@@ -0,0 +1,97 @@
+import { isURL } from 'class-validator';
+import { BadRequestException } from '../../exceptions';
+import { InstanceDto } from '../dto/instance.dto';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { ChatwootService } from '../services/chatwoot.service';
+import { Logger } from '../../config/logger.config';
+import { waMonitor } from '../whatsapp.module';
+import { ConfigService, HttpServer } from '../../config/env.config';
+
+const logger = new Logger('ChatwootController');
+
+export class ChatwootController {
+  constructor(
+    private readonly chatwootService: ChatwootService,
+    private readonly configService: ConfigService,
+  ) {}
+
+  public async createChatwoot(instance: InstanceDto, data: ChatwootDto) {
+    logger.verbose(
+      'requested createChatwoot from ' + instance.instanceName + ' instance',
+    );
+
+    if (data.enabled) {
+      if (!isURL(data.url, { require_tld: false })) {
+        throw new BadRequestException('url is not valid');
+      }
+
+      if (!data.account_id) {
+        throw new BadRequestException('account_id is required');
+      }
+
+      if (!data.token) {
+        throw new BadRequestException('token is required');
+      }
+
+      if (!data.sign_msg) {
+        throw new BadRequestException('sign_msg is required');
+      }
+    }
+
+    if (!data.enabled) {
+      logger.verbose('chatwoot disabled');
+      data.account_id = '';
+      data.token = '';
+      data.url = '';
+      data.sign_msg = false;
+    }
+
+    data.name_inbox = instance.instanceName;
+
+    const result = this.chatwootService.create(instance, data);
+
+    const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+
+    const response = {
+      ...result,
+      webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+    };
+
+    return response;
+  }
+
+  public async findChatwoot(instance: InstanceDto) {
+    logger.verbose('requested findChatwoot from ' + instance.instanceName + ' instance');
+    const result = await this.chatwootService.find(instance);
+
+    const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+
+    if (Object.keys(result).length === 0) {
+      return {
+        enabled: false,
+        url: '',
+        account_id: '',
+        token: '',
+        sign_msg: false,
+        name_inbox: '',
+        webhook_url: '',
+      };
+    }
+
+    const response = {
+      ...result,
+      webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+    };
+
+    return response;
+  }
+
+  public async receiveWebhook(instance: InstanceDto, data: any) {
+    logger.verbose(
+      'requested receiveWebhook from ' + instance.instanceName + ' instance',
+    );
+    const chatwootService = new ChatwootService(waMonitor, this.configService);
+
+    return chatwootService.receiveWebhook(instance, data);
+  }
+}

src/whatsapp/controllers/group.controller.ts

@@ -1,5 +1,6 @@
 import {
   CreateGroupDto,
+  GetParticipant,
   GroupDescriptionDto,
   GroupInvite,
   GroupJid,
@@ -59,11 +60,13 @@ export class GroupController {
     return await this.waMonitor.waInstances[instance.instanceName].findGroup(groupJid);
   }
 
-  public async fetchAllGroups(instance: InstanceDto) {
+  public async fetchAllGroups(instance: InstanceDto, getPaticipants: GetParticipant) {
     logger.verbose(
       'requested fetchAllGroups from ' + instance.instanceName + ' instance',
     );
-    return await this.waMonitor.waInstances[instance.instanceName].fetchAllGroups();
+    return await this.waMonitor.waInstances[instance.instanceName].fetchAllGroups(
+      getPaticipants,
+    );
   }
 
   public async inviteCode(instance: InstanceDto, groupJid: GroupJid) {

src/whatsapp/controllers/instance.controller.ts

@@ -1,6 +1,6 @@
 import { delay } from '@whiskeysockets/baileys';
 import EventEmitter2 from 'eventemitter2';
-import { Auth, ConfigService } from '../../config/env.config';
+import { Auth, ConfigService, HttpServer } from '../../config/env.config';
 import { BadRequestException, InternalServerErrorException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
@@ -8,9 +8,11 @@ import { AuthService, OldToken } from '../services/auth.service';
 import { WAMonitoringService } from '../services/monitor.service';
 import { WAStartupService } from '../services/whatsapp.service';
 import { WebhookService } from '../services/webhook.service';
+import { ChatwootService } from '../services/chatwoot.service';
 import { Logger } from '../../config/logger.config';
 import { wa } from '../types/wa.types';
 import { RedisCache } from '../../db/redis.client';
+import { isURL } from 'class-validator';
 
 export class InstanceController {
   constructor(
@@ -20,6 +22,7 @@ export class InstanceController {
     private readonly eventEmitter: EventEmitter2,
     private readonly authService: AuthService,
     private readonly webhookService: WebhookService,
+    private readonly chatwootService: ChatwootService,
     private readonly cache: RedisCache,
   ) {}
 
@@ -32,6 +35,10 @@ export class InstanceController {
     events,
     qrcode,
     token,
+    chatwoot_account_id,
+    chatwoot_token,
+    chatwoot_url,
+    chatwoot_sign_msg,
   }: InstanceDto) {
     this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
 
@@ -57,7 +64,10 @@ export class InstanceController {
         this.repository,
         this.cache,
       );
-      instance.instanceName = instanceName;
+      instance.instanceName = instanceName
+        .toLowerCase()
+        .replace(/[^a-z0-9]/g, '')
+        .replace(' ', '');
       this.logger.verbose('instance: ' + instance.instanceName + ' created');
 
       this.waMonitor.waInstances[instance.instanceName] = instance;
@@ -76,6 +86,9 @@ export class InstanceController {
       let getEvents: string[];
 
       if (webhook) {
+        if (!isURL(webhook, { require_tld: false })) {
+          throw new BadRequestException('Invalid "url" property in webhook');
+        }
         this.logger.verbose('creating webhook');
         try {
           this.webhookService.create(instance, {
@@ -91,16 +104,66 @@ export class InstanceController {
         }
       }
 
-      this.logger.verbose('instance created');
+      if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
-      this.logger.verbose({
+        this.logger.verbose('instance created');
-        instance: {
+        this.logger.verbose({
-          instanceName: instance.instanceName,
+          instance: {
-          status: 'created',
+            instanceName: instance.instanceName,
-        },
+            status: 'created',
-        hash,
+          },
-        webhook,
+          hash,
-        events: getEvents,
+          webhook,
-      });
+          events: getEvents,
+        });
+
+        return {
+          instance: {
+            instanceName: instance.instanceName,
+            status: 'created',
+          },
+          hash,
+          webhook,
+          events: getEvents,
+        };
+      }
+
+      if (!chatwoot_account_id) {
+        throw new BadRequestException('account_id is required');
+      }
+
+      if (!chatwoot_token) {
+        throw new BadRequestException('token is required');
+      }
+
+      if (!chatwoot_url) {
+        throw new BadRequestException('url is required');
+      }
+
+      if (!isURL(chatwoot_url, { require_tld: false })) {
+        throw new BadRequestException('Invalid "url" property in chatwoot');
+      }
+
+      const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+
+      try {
+        this.chatwootService.create(instance, {
+          enabled: true,
+          account_id: chatwoot_account_id,
+          token: chatwoot_token,
+          url: chatwoot_url,
+          sign_msg: chatwoot_sign_msg || false,
+          name_inbox: instance.instanceName,
+        });
+
+        this.chatwootService.initInstanceChatwoot(
+          instance,
+          instance.instanceName,
+          `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+          qrcode,
+        );
+      } catch (error) {
+        this.logger.log(error);
+      }
 
       return {
         instance: {
@@ -108,8 +171,15 @@ export class InstanceController {
           status: 'created',
         },
         hash,
-        webhook,
+        chatwoot: {
-        events: getEvents,
+          enabled: true,
+          account_id: chatwoot_account_id,
+          token: chatwoot_token,
+          url: chatwoot_url,
+          sign_msg: chatwoot_sign_msg || false,
+          name_inbox: instance.instanceName,
+          webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+        },
       };
     } else {
       this.logger.verbose('server mode');
@@ -124,7 +194,10 @@ export class InstanceController {
         this.repository,
         this.cache,
       );
-      instance.instanceName = instanceName;
+      instance.instanceName = instanceName
+        .toLowerCase()
+        .replace(/[^a-z0-9]/g, '')
+        .replace(' ', '');
 
       this.logger.verbose('instance: ' + instance.instanceName + ' created');
 
@@ -144,6 +217,10 @@ export class InstanceController {
       let getEvents: string[];
 
       if (webhook) {
+        if (!isURL(webhook, { require_tld: false })) {
+          throw new BadRequestException('Invalid "url" property in webhook');
+        }
+
         this.logger.verbose('creating webhook');
         try {
           this.webhookService.create(instance, {
@@ -159,27 +236,79 @@ export class InstanceController {
         }
       }
 
-      let getQrcode: wa.QrCode;
+      if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
+        let getQrcode: wa.QrCode;
 
-      if (qrcode) {
+        if (qrcode) {
-        this.logger.verbose('creating qrcode');
+          this.logger.verbose('creating qrcode');
-        await instance.connectToWhatsapp();
+          await instance.connectToWhatsapp();
-        await delay(2000);
+          await delay(2000);
-        getQrcode = instance.qrCode;
+          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,
+            status: 'created',
+          },
+          hash,
+          webhook,
+          webhook_by_events,
+          events: getEvents,
+          qrcode: getQrcode,
+        };
       }
 
-      this.logger.verbose('instance created');
+      if (!chatwoot_account_id) {
-      this.logger.verbose({
+        throw new BadRequestException('account_id is required');
-        instance: {
+      }
-          instanceName: instance.instanceName,
+
-          status: 'created',
+      if (!chatwoot_token) {
-        },
+        throw new BadRequestException('token is required');
-        hash,
+      }
-        webhook,
+
-        webhook_by_events,
+      if (!chatwoot_url) {
-        events: getEvents,
+        throw new BadRequestException('url is required');
-        qrcode: getQrcode,
+      }
-      });
+
+      if (!isURL(chatwoot_url, { require_tld: false })) {
+        throw new BadRequestException('Invalid "url" property in chatwoot');
+      }
+
+      const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+
+      try {
+        this.chatwootService.create(instance, {
+          enabled: true,
+          account_id: chatwoot_account_id,
+          token: chatwoot_token,
+          url: chatwoot_url,
+          sign_msg: chatwoot_sign_msg || false,
+          name_inbox: instance.instanceName,
+        });
+
+        this.chatwootService.initInstanceChatwoot(
+          instance,
+          instance.instanceName,
+          `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+          qrcode,
+        );
+      } catch (error) {
+        this.logger.log(error);
+      }
 
       return {
         instance: {
@@ -190,7 +319,15 @@ export class InstanceController {
         webhook,
         webhook_by_events,
         events: getEvents,
-        qrcode: getQrcode,
+        chatwoot: {
+          enabled: true,
+          account_id: chatwoot_account_id,
+          token: chatwoot_token,
+          url: chatwoot_url,
+          sign_msg: chatwoot_sign_msg || false,
+          name_inbox: instance.instanceName,
+          webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+        },
       };
     }
   }
@@ -226,24 +363,8 @@ export class InstanceController {
     try {
       this.logger.verbose('requested restartInstance from ' + instanceName + ' instance');
 
-      this.logger.verbose('deleting instance: ' + instanceName);
+      this.logger.verbose('logging out instance: ' + instanceName);
-      delete this.waMonitor.waInstances[instanceName];
+      this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
-
-      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) {
@@ -268,6 +389,14 @@ export class InstanceController {
 
   public async logout({ instanceName }: InstanceDto) {
     this.logger.verbose('requested logout from ' + instanceName + ' instance');
+    const stateConn = await this.connectionState({ instanceName });
+
+    if (stateConn.state === 'close') {
+      throw new BadRequestException(
+        'The "' + instanceName + '" instance is not connected',
+      );
+    }
+
     try {
       this.logger.verbose('logging out instance: ' + instanceName);
       await this.waMonitor.waInstances[instanceName]?.client?.logout(
@@ -288,10 +417,9 @@ export class InstanceController {
     const stateConn = await this.connectionState({ instanceName });
 
     if (stateConn.state === 'open') {
-      throw new BadRequestException([
+      throw new BadRequestException(
-        'Deletion failed',
+        'The "' + instanceName + '" instance needs to be disconnected',
-        'The instance needs to be disconnected',
+      );
-      ]);
     }
     try {
       if (stateConn.state === 'connecting') {

src/whatsapp/controllers/sendMessage.controller.ts

@@ -5,7 +5,6 @@ import {
   SendAudioDto,
   SendButtonDto,
   SendContactDto,
-  SendLinkPreviewDto,
   SendListDto,
   SendLocationDto,
   SendMediaDto,
@@ -31,9 +30,15 @@ export class SendMessageController {
 
   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.');
+    if (
+      isBase64(data?.mediaMessage?.media) &&
+      !data?.mediaMessage?.fileName &&
+      data?.mediaMessage?.mediatype === 'document'
+    ) {
+      throw new BadRequestException('For base64 the file name must be informed.');
     }
+
     logger.verbose(
       'isURL: ' +
         isURL(data?.mediaMessage?.media) +
@@ -119,9 +124,4 @@ export class SendMessageController {
     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/dto/chatwoot.dto.ts

@@ -0,0 +1,8 @@
+export class ChatwootDto {
+  enabled?: boolean;
+  account_id?: string;
+  token?: string;
+  url?: string;
+  name_inbox?: string;
+  sign_msg?: boolean;
+}

src/whatsapp/dto/group.dto.ts

@@ -23,6 +23,10 @@ export class GroupJid {
   groupJid: string;
 }
 
+export class GetParticipant {
+  getParticipants: string;
+}
+
 export class GroupInvite {
   inviteCode: string;
 }

src/whatsapp/dto/instance.dto.ts

@@ -5,4 +5,8 @@ export class InstanceDto {
   events?: string[];
   qrcode?: boolean;
   token?: string;
+  chatwoot_account_id?: string;
+  chatwoot_token?: string;
+  chatwoot_url?: string;
+  chatwoot_sign_msg?: boolean;
 }

src/whatsapp/dto/sendMessage.dto.ts

@@ -28,10 +28,6 @@ class TextMessage {
   text: string;
 }
 
-class linkPreviewMessage {
-  text: string;
-}
-
 export class StatusMessage {
   type: string;
   content: string;
@@ -52,10 +48,6 @@ export class SendTextDto extends Metadata {
   textMessage: TextMessage;
 }
 
-export class SendLinkPreviewDto extends Metadata {
-  linkPreview: linkPreviewMessage;
-}
-
 export class SendStatusDto extends Metadata {
   statusMessage: StatusMessage;
 }

src/whatsapp/guards/instance.guard.ts

@@ -11,7 +11,6 @@ import {
 import { InstanceDto } from '../dto/instance.dto';
 import { cache, waMonitor } from '../whatsapp.module';
 import { Database, Redis, configService } from '../../config/env.config';
-import { RedisCache } from '../../db/redis.client';
 
 async function getInstance(instanceName: string) {
   const db = configService.get<Database>('DATABASE');

src/whatsapp/models/chatwoot.model.ts

@@ -0,0 +1,29 @@
+import { Schema } from 'mongoose';
+import { dbserver } from '../../db/db.connect';
+
+export class ChatwootRaw {
+  _id?: string;
+  enabled?: boolean;
+  account_id?: string;
+  token?: string;
+  url?: string;
+  name_inbox?: string;
+  sign_msg?: boolean;
+}
+
+const chatwootSchema = new Schema<ChatwootRaw>({
+  _id: { type: String, _id: true },
+  enabled: { type: Boolean, required: true },
+  account_id: { type: String, required: true },
+  token: { type: String, required: true },
+  url: { type: String, required: true },
+  name_inbox: { type: String, required: true },
+  sign_msg: { type: Boolean, required: true },
+});
+
+export const ChatwootModel = dbserver?.model(
+  ChatwootRaw.name,
+  chatwootSchema,
+  'chatwoot',
+);
+export type IChatwootModel = typeof ChatwootModel;

src/whatsapp/models/index.ts

@@ -3,3 +3,4 @@ export * from './contact.model';
 export * from './message.model';
 export * from './auth.model';
 export * from './webhook.model';
+export * from './chatwoot.model';

src/whatsapp/models/webhook.model.ts

@@ -14,6 +14,7 @@ const webhookSchema = new Schema<WebhookRaw>({
   url: { type: String, required: true },
   enabled: { type: Boolean, required: true },
   events: { type: [String], required: true },
+  webhook_by_events: { type: Boolean, required: true },
 });
 
 export const WebhookModel = dbserver?.model(WebhookRaw.name, webhookSchema, 'webhook');

src/whatsapp/repository/chatwoot.repository.ts

@@ -0,0 +1,75 @@
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { ConfigService } from '../../config/env.config';
+import { join } from 'path';
+import { readFileSync } from 'fs';
+import { IChatwootModel, ChatwootRaw } from '../models';
+import { Logger } from '../../config/logger.config';
+
+export class ChatwootRepository extends Repository {
+  constructor(
+    private readonly chatwootModel: IChatwootModel,
+    private readonly configService: ConfigService,
+  ) {
+    super(configService);
+  }
+
+  private readonly logger = new Logger('ChatwootRepository');
+
+  public async create(data: ChatwootRaw, instance: string): Promise<IInsert> {
+    try {
+      this.logger.verbose('creating chatwoot');
+      if (this.dbSettings.ENABLED) {
+        this.logger.verbose('saving chatwoot to db');
+        const insert = await this.chatwootModel.replaceOne(
+          { _id: instance },
+          { ...data },
+          { upsert: true },
+        );
+
+        this.logger.verbose(
+          'chatwoot saved to db: ' + insert.modifiedCount + ' chatwoot',
+        );
+        return { insertCount: insert.modifiedCount };
+      }
+
+      this.logger.verbose('saving chatwoot to store');
+
+      this.writeStore<ChatwootRaw>({
+        path: join(this.storePath, 'chatwoot'),
+        fileName: instance,
+        data,
+      });
+
+      this.logger.verbose(
+        'chatwoot saved to store in path: ' +
+          join(this.storePath, 'chatwoot') +
+          '/' +
+          instance,
+      );
+
+      this.logger.verbose('chatwoot created');
+      return { insertCount: 1 };
+    } catch (error) {
+      return error;
+    }
+  }
+
+  public async find(instance: string): Promise<ChatwootRaw> {
+    try {
+      this.logger.verbose('finding chatwoot');
+      if (this.dbSettings.ENABLED) {
+        this.logger.verbose('finding chatwoot in db');
+        return await this.chatwootModel.findOne({ _id: instance });
+      }
+
+      this.logger.verbose('finding chatwoot in store');
+      return JSON.parse(
+        readFileSync(join(this.storePath, 'chatwoot', instance + '.json'), {
+          encoding: 'utf-8',
+        }),
+      ) as ChatwootRaw;
+    } catch (error) {
+      return {};
+    }
+  }
+}

src/whatsapp/repository/repository.manager.ts

@@ -4,12 +4,14 @@ import { ContactRepository } from './contact.repository';
 import { MessageUpRepository } from './messageUp.repository';
 import { MongoClient } from 'mongodb';
 import { WebhookRepository } from './webhook.repository';
+import { ChatwootRepository } from './chatwoot.repository';
+
 import { AuthRepository } from './auth.repository';
 import { Auth, ConfigService, Database } from '../../config/env.config';
 import { execSync } from 'child_process';
 import { join } from 'path';
+import fs from 'fs';
 import { Logger } from '../../config/logger.config';
-
 export class RepositoryBroker {
   constructor(
     public readonly message: MessageRepository,
@@ -17,11 +19,11 @@ export class RepositoryBroker {
     public readonly contact: ContactRepository,
     public readonly messageUpdate: MessageUpRepository,
     public readonly webhook: WebhookRepository,
+    public readonly chatwoot: ChatwootRepository,
     public readonly auth: AuthRepository,
     private configService: ConfigService,
     dbServer?: MongoClient,
   ) {
-    this.logger.verbose('initializing repository broker');
     this.dbClient = dbServer;
     this.__init_repo_without_db__();
   }
@@ -36,36 +38,59 @@ export class RepositoryBroker {
   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(
+      try {
-        `mkdir -p ${join(
+        const authDir = join(
           storePath,
           'auth',
           this.configService.get<Auth>('AUTHENTICATION').TYPE,
-        )}`,
+        );
-      );
+        const chatsDir = join(storePath, 'chats');
+        const contactsDir = join(storePath, 'contacts');
+        const messagesDir = join(storePath, 'messages');
+        const messageUpDir = join(storePath, 'message-up');
+        const webhookDir = join(storePath, 'webhook');
+        const chatwootDir = join(storePath, 'chatwoot');
+        const tempDir = join(storePath, 'temp');
 
-      this.logger.verbose('creating chats path: ' + join(storePath, 'chats'));
+        // Check if directories exist, create them if not
-      execSync(`mkdir -p ${join(storePath, 'chats')}`);
+        if (!fs.existsSync(authDir)) {
-
+          this.logger.verbose('creating auth dir: ' + authDir);
-      this.logger.verbose('creating contacts path: ' + join(storePath, 'contacts'));
+          fs.mkdirSync(authDir, { recursive: true });
-      execSync(`mkdir -p ${join(storePath, 'contacts')}`);
+        }
-
+        if (!fs.existsSync(chatsDir)) {
-      this.logger.verbose('creating messages path: ' + join(storePath, 'messages'));
+          this.logger.verbose('creating chats dir: ' + chatsDir);
-      execSync(`mkdir -p ${join(storePath, 'messages')}`);
+          fs.mkdirSync(chatsDir, { recursive: true });
-
+        }
-      this.logger.verbose('creating message-up path: ' + join(storePath, 'message-up'));
+        if (!fs.existsSync(contactsDir)) {
-      execSync(`mkdir -p ${join(storePath, 'message-up')}`);
+          this.logger.verbose('creating contacts dir: ' + contactsDir);
-
+          fs.mkdirSync(contactsDir, { recursive: true });
-      this.logger.verbose('creating webhook path: ' + join(storePath, 'webhook'));
+        }
-      execSync(`mkdir -p ${join(storePath, 'webhook')}`);
+        if (!fs.existsSync(messagesDir)) {
-
+          this.logger.verbose('creating messages dir: ' + messagesDir);
-      this.logger.verbose('creating temp path: ' + join(storePath, 'temp'));
+          fs.mkdirSync(messagesDir, { recursive: true });
-      execSync(`mkdir -p ${join(storePath, 'temp')}`);
+        }
+        if (!fs.existsSync(messageUpDir)) {
+          this.logger.verbose('creating message-up dir: ' + messageUpDir);
+          fs.mkdirSync(messageUpDir, { recursive: true });
+        }
+        if (!fs.existsSync(webhookDir)) {
+          this.logger.verbose('creating webhook dir: ' + webhookDir);
+          fs.mkdirSync(webhookDir, { recursive: true });
+        }
+        if (!fs.existsSync(chatwootDir)) {
+          this.logger.verbose('creating chatwoot dir: ' + chatwootDir);
+          fs.mkdirSync(chatwootDir, { recursive: true });
+        }
+        if (!fs.existsSync(tempDir)) {
+          this.logger.verbose('creating temp dir: ' + tempDir);
+          fs.mkdirSync(tempDir, { recursive: true });
+        }
+      } catch (error) {
+        this.logger.error(error);
+      }
     }
   }
 }

src/whatsapp/routers/chatwoot.router.ts

@@ -0,0 +1,68 @@
+import { RequestHandler, Router } from 'express';
+import { instanceNameSchema, chatwootSchema } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
+import { InstanceDto } from '../dto/instance.dto';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { chatwootController } from '../whatsapp.module';
+import { ChatwootService } from '../services/chatwoot.service';
+import { HttpStatus } from './index.router';
+import { Logger } from '../../config/logger.config';
+
+const logger = new Logger('ChatwootRouter');
+
+export class ChatwootRouter extends RouterBroker {
+  constructor(...guards: RequestHandler[]) {
+    super();
+    this.router
+      .post(this.routerPath('set'), ...guards, async (req, res) => {
+        logger.verbose('request received in setChatwoot');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.dataValidate<ChatwootDto>({
+          request: req,
+          schema: chatwootSchema,
+          ClassRef: ChatwootDto,
+          execute: (instance, data) => chatwootController.createChatwoot(instance, data),
+        });
+
+        res.status(HttpStatus.CREATED).json(response);
+      })
+      .get(this.routerPath('find'), ...guards, async (req, res) => {
+        logger.verbose('request received in findChatwoot');
+        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) => chatwootController.findChatwoot(instance),
+        });
+
+        res.status(HttpStatus.OK).json(response);
+      })
+      .post(this.routerPath('webhook'), async (req, res) => {
+        logger.verbose('request received in findChatwoot');
+        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, data) => chatwootController.receiveWebhook(instance, data),
+        });
+
+        res.status(HttpStatus.OK).json(response);
+      });
+  }
+
+  public readonly router = Router();
+}

src/whatsapp/routers/group.router.ts

@@ -10,6 +10,7 @@ import {
   updateGroupDescriptionSchema,
   groupInviteSchema,
   groupSendInviteSchema,
+  getParticipantsSchema,
 } from '../../validate/validate.schema';
 import { RouterBroker } from '../abstract/abstract.router';
 import {
@@ -23,6 +24,7 @@ import {
   GroupUpdateSettingDto,
   GroupToggleEphemeralDto,
   GroupSendInvite,
+  GetParticipant,
 } from '../dto/group.dto';
 import { groupController } from '../whatsapp.module';
 import { HttpStatus } from './index.router';
@@ -123,11 +125,11 @@ export class GroupRouter extends RouterBroker {
 
         logger.verbose('request query: ');
         logger.verbose(req.query);
-        const response = await this.groupNoValidate<GroupJid>({
+        const response = await this.getParticipantsValidate<GetParticipant>({
           request: req,
-          schema: {},
+          schema: getParticipantsSchema,
-          ClassRef: GroupJid,
+          ClassRef: GetParticipant,
-          execute: (instance) => groupController.fetchAllGroups(instance),
+          execute: (instance, data) => groupController.fetchAllGroups(instance, data),
         });
 
         res.status(HttpStatus.OK).json(response);

src/whatsapp/routers/index.router.ts

@@ -8,6 +8,8 @@ import { InstanceRouter } from './instance.router';
 import { MessageRouter } from './sendMessage.router';
 import { ViewsRouter } from './view.router';
 import { WebhookRouter } from './webhook.router';
+import { ChatwootRouter } from './chatwoot.router';
+import fs from 'fs';
 
 enum HttpStatus {
   OK = 200,
@@ -23,7 +25,16 @@ const router = Router();
 const authType = configService.get<Auth>('AUTHENTICATION').TYPE;
 const guards = [instanceExistsGuard, instanceLoggedGuard, authGuard[authType]];
 
+const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+
 router
+  .get('/', (req, res) => {
+    res.status(HttpStatus.OK).json({
+      status: HttpStatus.OK,
+      message: 'Welcome to the Evolution API, it is working!',
+      version: packageJson.version,
+    });
+  })
   .use(
     '/instance',
     new InstanceRouter(configService, ...guards).router,
@@ -32,6 +43,7 @@ router
   .use('/message', new MessageRouter(...guards).router)
   .use('/chat', new ChatRouter(...guards).router)
   .use('/group', new GroupRouter(...guards).router)
-  .use('/webhook', new WebhookRouter(...guards).router);
+  .use('/webhook', new WebhookRouter(...guards).router)
+  .use('/chatwoot', new ChatwootRouter(...guards).router);
 
 export { router, HttpStatus };

src/whatsapp/routers/instance.router.ts

@@ -23,6 +23,7 @@ export class InstanceRouter extends RouterBroker {
 
         logger.verbose('request query: ');
         logger.verbose(req.query);
+
         const response = await this.dataValidate<InstanceDto>({
           request: req,
           schema: instanceNameSchema,

src/whatsapp/routers/sendMessage.router.ts

@@ -3,7 +3,6 @@ import {
   audioMessageSchema,
   buttonMessageSchema,
   contactMessageSchema,
-  linkPreviewSchema,
   listMessageSchema,
   locationMessageSchema,
   mediaMessageSchema,
@@ -17,7 +16,6 @@ import {
   SendAudioDto,
   SendButtonDto,
   SendContactDto,
-  SendLinkPreviewDto,
   SendListDto,
   SendLocationDto,
   SendMediaDto,
@@ -199,23 +197,6 @@ export class MessageRouter extends RouterBroker {
 
         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,
-          ClassRef: SendLinkPreviewDto,
-          execute: (instance, data) =>
-            sendMessageController.sendLinkPreview(instance, data),
-        });
-
-        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: ');

src/whatsapp/services/monitor.service.ts

@@ -9,6 +9,7 @@ import {
   ConfigService,
   Database,
   DelInstance,
+  HttpServer,
   Redis,
 } from '../../config/env.config';
 import { RepositoryBroker } from '../repository/repository.manager';
@@ -83,70 +84,69 @@ export class WAMonitoringService {
     for await (const [key, value] of Object.entries(this.waInstances)) {
       if (value) {
         this.logger.verbose('get instance info: ' + key);
+        let chatwoot: any;
+
+        const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+
+        const findChatwoot = await this.waInstances[key].findChatwoot();
+
+        if (findChatwoot.enabled) {
+          chatwoot = {
+            ...findChatwoot,
+            webhook_url: `${urlServer}/chatwoot/webhook/${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';
 
-            instances.push({
+          const instanceData = {
-              instance: {
+            instance: {
-                instanceName: key,
+              instanceName: key,
-                owner: value.wuid,
+              owner: value.wuid,
-                profileName: (await value.getProfileName()) || 'not loaded',
+              profileName: (await value.getProfileName()) || 'not loaded',
-                profilePictureUrl: value.profilePictureUrl,
+              profilePictureUrl: value.profilePictureUrl,
-                status: (await value.getProfileStatus()) || '',
+              profileStatus: (await value.getProfileStatus()) || '',
-                apikey,
+              status: value.connectionStatus.state,
-              },
+            },
-            });
+          };
-          } else {
+
-            this.logger.verbose(
+          if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
-              'instance: ' + key + ' - hash not exposed in fetch instances',
+            instanceData.instance['serverUrl'] =
-            );
+              this.configService.get<HttpServer>('SERVER').URL;
-            instances.push({
+
-              instance: {
+            instanceData.instance['apikey'] = (
-                instanceName: key,
+              await this.repository.auth.find(key)
-                owner: value.wuid,
+            ).apikey;
-                profileName: (await value.getProfileName()) || 'not loaded',
+
-                profilePictureUrl: value.profilePictureUrl,
+            instanceData.instance['chatwoot'] = chatwoot;
-                status: (await value.getProfileStatus()) || '',
-              },
-            });
           }
+
+          instances.push(instanceData);
         } 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';
 
-            instances.push({
+          const instanceData = {
-              instance: {
+            instance: {
-                instanceName: key,
+              instanceName: key,
-                status: value.connectionStatus.state,
+              status: value.connectionStatus.state,
-                apikey,
+            },
-              },
+          };
-            });
+
-          } else {
+          if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
-            this.logger.verbose(
+            instanceData.instance['serverUrl'] =
-              'instance: ' + key + ' - hash not exposed in fetch instances',
+              this.configService.get<HttpServer>('SERVER').URL;
-            );
+
-            instances.push({
+            instanceData.instance['apikey'] = (
-              instance: {
+              await this.repository.auth.find(key)
-                instanceName: key,
+            ).apikey;
-                status: value.connectionStatus.state,
+
-              },
+            instanceData.instance['chatwoot'] = chatwoot;
-            });
           }
+
+          instances.push(instanceData);
         }
       }
     }
@@ -232,6 +232,7 @@ export class WAMonitoringService {
 
       execSync(`rm -rf ${join(STORE_DIR, 'auth', 'apikey', instanceName + '.json')}`);
       execSync(`rm -rf ${join(STORE_DIR, 'webhook', instanceName + '.json')}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'chatwoot', instanceName + '*')}`);
     }
   }
 

src/whatsapp/services/webhook.service.ts

@@ -18,9 +18,17 @@ 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();
+      const result = await this.waMonitor.waInstances[
+        instance.instanceName
+      ].findWebhook();
+
+      if (Object.keys(result).length === 0) {
+        throw new Error('Webhook not found');
+      }
+
+      return result;
     } catch (error) {
-      return { enabled: null, url: '' };
+      return { enabled: false, url: '', events: [], webhook_by_events: false };
     }
   }
 }

src/whatsapp/services/whatsapp.service.ts

@@ -30,7 +30,6 @@ import makeWASocket, {
   WAMessageUpdate,
   WASocket,
   getAggregateVotesInPollMessage,
-  Browsers,
 } from '@whiskeysockets/baileys';
 import {
   Auth,
@@ -38,6 +37,7 @@ import {
   ConfigService,
   ConfigSessionPhone,
   Database,
+  HttpServer,
   QrCode,
   Redis,
   Webhook,
@@ -76,7 +76,6 @@ import {
   SendReactionDto,
   SendTextDto,
   SendPollDto,
-  SendLinkPreviewDto,
   SendStickerDto,
   SendStatusDto,
   StatusMessage,
@@ -109,11 +108,13 @@ import {
   GroupSubjectDto,
   GroupDescriptionDto,
   GroupSendInvite,
+  GetParticipant,
 } from '../dto/group.dto';
 import { MessageUpQuery } from '../repository/messageUp.repository';
 import { useMultiFileAuthStateDb } from '../../utils/use-multi-file-auth-state-db';
 import Long from 'long';
 import { WebhookRaw } from '../models/webhook.model';
+import { ChatwootRaw } from '../models/chatwoot.model';
 import { dbserver } from '../../db/db.connect';
 import NodeCache from 'node-cache';
 import { useMultiFileAuthStateRedisDb } from '../../utils/use-multi-file-auth-state-redis-db';
@@ -121,6 +122,8 @@ import sharp from 'sharp';
 import { RedisCache } from '../../db/redis.client';
 import { Log } from '../../config/env.config';
 import ProxyAgent from 'proxy-agent';
+import { ChatwootService } from './chatwoot.service';
+import { waMonitor } from '../whatsapp.module';
 
 export class WAStartupService {
   constructor(
@@ -138,13 +141,16 @@ export class WAStartupService {
   private readonly instance: wa.Instance = {};
   public client: WASocket;
   private readonly localWebhook: wa.LocalWebHook = {};
+  private readonly localChatwoot: wa.LocalChatwoot = {};
   private stateConnection: wa.StateConnection = { state: 'close' };
-  private readonly storePath = join(ROOT_DIR, 'store');
+  public readonly storePath = join(ROOT_DIR, 'store');
   private readonly msgRetryCounterCache: CacheStore = new NodeCache();
   private readonly userDevicesCache: CacheStore = new NodeCache();
   private endSession = false;
   private logBaileys = this.configService.get<Log>('LOG').BAILEYS;
 
+  private chatwootService = new ChatwootService(waMonitor, this.configService);
+
   public set instanceName(name: string) {
     this.logger.verbose(`Initializing instance '${name}'`);
     if (!name) {
@@ -159,6 +165,17 @@ export class WAStartupService {
       instance: this.instance.name,
       status: 'created',
     });
+
+    if (this.localChatwoot.enabled) {
+      this.chatwootService.eventWhatsapp(
+        Events.STATUS_INSTANCE,
+        { instanceName: this.instance.name },
+        {
+          instance: this.instance.name,
+          status: 'created',
+        },
+      );
+    }
   }
 
   public get instanceName() {
@@ -268,13 +285,76 @@ export class WAStartupService {
     return data;
   }
 
+  private async loadChatwoot() {
+    this.logger.verbose('Loading chatwoot');
+    const data = await this.repository.chatwoot.find(this.instanceName);
+    this.localChatwoot.enabled = data?.enabled;
+    this.logger.verbose(`Chatwoot enabled: ${this.localChatwoot.enabled}`);
+
+    this.localChatwoot.account_id = data?.account_id;
+    this.logger.verbose(`Chatwoot account id: ${this.localChatwoot.account_id}`);
+
+    this.localChatwoot.token = data?.token;
+    this.logger.verbose(`Chatwoot token: ${this.localChatwoot.token}`);
+
+    this.localChatwoot.url = data?.url;
+    this.logger.verbose(`Chatwoot url: ${this.localChatwoot.url}`);
+
+    this.localChatwoot.name_inbox = data?.name_inbox;
+    this.logger.verbose(`Chatwoot inbox name: ${this.localChatwoot.name_inbox}`);
+
+    this.localChatwoot.sign_msg = data?.sign_msg;
+    this.logger.verbose(`Chatwoot sign msg: ${this.localChatwoot.sign_msg}`);
+
+    this.logger.verbose('Chatwoot loaded');
+  }
+
+  public async setChatwoot(data: ChatwootRaw) {
+    this.logger.verbose('Setting chatwoot');
+    await this.repository.chatwoot.create(data, this.instanceName);
+    this.logger.verbose(`Chatwoot account id: ${data.account_id}`);
+    this.logger.verbose(`Chatwoot token: ${data.token}`);
+    this.logger.verbose(`Chatwoot url: ${data.url}`);
+    this.logger.verbose(`Chatwoot inbox name: ${data.name_inbox}`);
+    this.logger.verbose(`Chatwoot sign msg: ${data.sign_msg}`);
+
+    Object.assign(this.localChatwoot, data);
+    this.logger.verbose('Chatwoot set');
+  }
+
+  public async findChatwoot() {
+    this.logger.verbose('Finding chatwoot');
+    const data = await this.repository.chatwoot.find(this.instanceName);
+
+    if (!data) {
+      this.logger.verbose('Chatwoot not found');
+      throw new NotFoundException('Chatwoot not found');
+    }
+
+    this.logger.verbose(`Chatwoot account id: ${data.account_id}`);
+    this.logger.verbose(`Chatwoot token: ${data.token}`);
+    this.logger.verbose(`Chatwoot url: ${data.url}`);
+    this.logger.verbose(`Chatwoot inbox name: ${data.name_inbox}`);
+    this.logger.verbose(`Chatwoot sign msg: ${data.sign_msg}`);
+
+    return data;
+  }
+
   public async sendDataWebhook<T = any>(event: Events, data: T, local = true) {
     const webhookGlobal = this.configService.get<Webhook>('WEBHOOK');
     const webhookLocal = this.localWebhook.events;
+    const serverUrl = this.configService.get<HttpServer>('SERVER').URL;
     const we = event.replace(/[\.-]/gm, '_').toUpperCase();
     const transformedWe = we.replace(/_/gm, '-').toLowerCase();
     const instance = this.configService.get<Auth>('AUTHENTICATION').INSTANCE;
 
+    const expose =
+      this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES;
+    const tokenStore = await this.repository.auth.find(this.instanceName);
+    const instanceApikey = tokenStore.apikey || 'Apikey not found';
+
+    const globalApiKey = this.configService.get<Auth>('AUTHENTICATION').API_KEY.KEY;
+
     if (local && instance.MODE !== 'container') {
       if (Array.isArray(webhookLocal) && webhookLocal.includes(we)) {
         this.logger.verbose('Sending data to webhook local');
@@ -287,25 +367,40 @@ export class WAStartupService {
         }
 
         if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
-          this.logger.log({
+          const logData = {
             local: WAStartupService.name + '.sendDataWebhook-local',
             url: baseURL,
             event,
             instance: this.instance.name,
             data,
             destination: this.localWebhook.url,
-          });
+            server_url: serverUrl,
+            apikey: (expose && instanceApikey) || null,
+          };
+
+          if (expose && instanceApikey) {
+            logData['apikey'] = instanceApikey;
+          }
+
+          this.logger.log(logData);
         }
 
         try {
           if (this.localWebhook.enabled && isURL(this.localWebhook.url)) {
             const httpService = axios.create({ baseURL });
-            await httpService.post('', {
+            const postData = {
               event,
               instance: this.instance.name,
               data,
               destination: this.localWebhook.url,
-            });
+              server_url: serverUrl,
+            };
+
+            if (expose && instanceApikey) {
+              postData['apikey'] = instanceApikey;
+            }
+
+            await httpService.post('', postData);
           }
         } catch (error) {
           this.logger.error({
@@ -318,6 +413,7 @@ export class WAStartupService {
             stack: error?.stack,
             name: error?.name,
             url: baseURL,
+            server_url: serverUrl,
           });
         }
       }
@@ -345,25 +441,39 @@ export class WAStartupService {
         }
 
         if (this.configService.get<Log>('LOG').LEVEL.includes('WEBHOOKS')) {
-          this.logger.log({
+          const logData = {
             local: WAStartupService.name + '.sendDataWebhook-global',
             url: globalURL,
             event,
             instance: this.instance.name,
             data,
             destination: localUrl,
-          });
+            server_url: serverUrl,
+          };
+
+          if (expose && globalApiKey) {
+            logData['apikey'] = globalApiKey;
+          }
+
+          this.logger.log(logData);
         }
 
         try {
           if (globalWebhook && globalWebhook?.ENABLED && isURL(globalURL)) {
             const httpService = axios.create({ baseURL: globalURL });
-            await httpService.post('', {
+            const postData = {
               event,
               instance: this.instance.name,
               data,
               destination: localUrl,
-            });
+              server_url: serverUrl,
+            };
+
+            if (expose && globalApiKey) {
+              postData['apikey'] = globalApiKey;
+            }
+
+            await httpService.post('', postData);
           }
         } catch (error) {
           this.logger.error({
@@ -376,6 +486,7 @@ export class WAStartupService {
             stack: error?.stack,
             name: error?.name,
             url: globalURL,
+            server_url: serverUrl,
           });
         }
       }
@@ -399,6 +510,17 @@ export class WAStartupService {
           statusCode: DisconnectReason.badSession,
         });
 
+        if (this.localChatwoot.enabled) {
+          this.chatwootService.eventWhatsapp(
+            Events.QRCODE_UPDATED,
+            { instanceName: this.instance.name },
+            {
+              message: 'QR code limit reached, please login again',
+              statusCode: DisconnectReason.badSession,
+            },
+          );
+        }
+
         this.logger.verbose('Sending data to webhook in event CONNECTION_UPDATE');
         this.sendDataWebhook(Events.CONNECTION_UPDATE, {
           instance: this.instance.name,
@@ -412,6 +534,17 @@ export class WAStartupService {
           status: 'removed',
         });
 
+        if (this.localChatwoot.enabled) {
+          this.chatwootService.eventWhatsapp(
+            Events.STATUS_INSTANCE,
+            { instanceName: this.instance.name },
+            {
+              instance: this.instance.name,
+              status: 'removed',
+            },
+          );
+        }
+
         this.logger.verbose('endSession defined as true');
         this.endSession = true;
 
@@ -442,6 +575,16 @@ export class WAStartupService {
         this.sendDataWebhook(Events.QRCODE_UPDATED, {
           qrcode: { instance: this.instance.name, code: qr, base64 },
         });
+
+        if (this.localChatwoot.enabled) {
+          this.chatwootService.eventWhatsapp(
+            Events.QRCODE_UPDATED,
+            { instanceName: this.instance.name },
+            {
+              qrcode: { instance: this.instance.name, code: qr, base64 },
+            },
+          );
+        }
       });
 
       this.logger.verbose('Generating QR code in terminal');
@@ -482,6 +625,17 @@ export class WAStartupService {
           status: 'removed',
         });
 
+        if (this.localChatwoot.enabled) {
+          this.chatwootService.eventWhatsapp(
+            Events.STATUS_INSTANCE,
+            { instanceName: this.instance.name },
+            {
+              instance: this.instance.name,
+              status: 'removed',
+            },
+          );
+        }
+
         this.logger.verbose('Emittin event logout.instance');
         this.eventEmitter.emit('logout.instance', this.instance.name, 'inner');
         this.client?.ws?.close();
@@ -502,6 +656,17 @@ export class WAStartupService {
         │    CONNECTED TO WHATSAPP     │
         └──────────────────────────────┘`.replace(/^ +/gm, '  '),
       );
+
+      if (this.localChatwoot.enabled) {
+        this.chatwootService.eventWhatsapp(
+          Events.CONNECTION_UPDATE,
+          { instanceName: this.instance.name },
+          {
+            instance: this.instance.name,
+            status: 'open',
+          },
+        );
+      }
     }
   }
 
@@ -596,14 +761,14 @@ export class WAStartupService {
     this.logger.verbose('Connecting to whatsapp');
     try {
       this.loadWebhook();
+      this.loadChatwoot();
 
       this.instance.authState = await this.defineAuthState();
 
       const { version } = await fetchLatestBaileysVersion();
       this.logger.verbose('Baileys version: ' + version);
       const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
-      // const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
+      const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
-      const browser: WABrowserDescription = Browsers.appropriate(session.CLIENT);
       this.logger.verbose('Browser: ' + JSON.stringify(browser));
 
       const socketConfig: UserFacingSocketConfig = {
@@ -620,6 +785,7 @@ export class WAStartupService {
         version,
         connectTimeoutMs: 60_000,
         qrTimeout: 40_000,
+        defaultQueryTimeoutMs: undefined,
         emitOwnEvents: false,
         msgRetryCounterCache: this.msgRetryCounterCache,
         getMessage: async (key) =>
@@ -910,6 +1076,14 @@ export class WAStartupService {
       this.logger.verbose('Sending data to webhook in event MESSAGES_UPSERT');
       await this.sendDataWebhook(Events.MESSAGES_UPSERT, messageRaw);
 
+      if (this.localChatwoot.enabled) {
+        await this.chatwootService.eventWhatsapp(
+          Events.MESSAGES_UPSERT,
+          { instanceName: this.instance.name },
+          messageRaw,
+        );
+      }
+
       this.logger.verbose('Inserting message in database');
       await this.repository.message.insert(
         [messageRaw],
@@ -948,6 +1122,14 @@ export class WAStartupService {
         this.logger.verbose('Sending data to webhook in event CONTACTS_UPDATE');
         await this.sendDataWebhook(Events.CONTACTS_UPDATE, contactRaw);
 
+        if (this.localChatwoot.enabled) {
+          await this.chatwootService.eventWhatsapp(
+            Events.CONTACTS_UPDATE,
+            { instanceName: this.instance.name },
+            contactRaw,
+          );
+        }
+
         this.logger.verbose('Updating contact in database');
         await this.repository.contact.update(
           [contactRaw],
@@ -981,11 +1163,7 @@ export class WAStartupService {
         5: 'PLAYED',
       };
       for await (const { key, update } of args) {
-        if (
+        if (key.remoteJid !== 'status@broadcast' && !key?.remoteJid?.match(/(:\d+)/)) {
-          key.remoteJid !== 'status@broadcast' &&
-          !key?.remoteJid?.match(/(:\d+)/) &&
-          key.fromMe
-        ) {
           this.logger.verbose('Message update is valid');
 
           let pollUpdates: any;
@@ -1005,6 +1183,16 @@ export class WAStartupService {
             }
           }
 
+          if (status[update.status] === 'READ' && !key.fromMe) return;
+
+          if (update.message === null && update.status === undefined) {
+            this.logger.verbose('Message deleted');
+
+            this.logger.verbose('Sending data to webhook in event MESSAGE_DELETE');
+            await this.sendDataWebhook(Events.MESSAGES_DELETE, key);
+            return;
+          }
+
           const message: MessageUpdateRaw = {
             ...key,
             status: status[update.status],
@@ -1149,17 +1337,15 @@ export class WAStartupService {
 
   // Check if the number is MX or AR
   private formatMXOrARNumber(jid: string): string {
-    const regexp = new RegExp(/^(\d{2})(\d{2})\d{1}(\d{8})$/);
+    const countryCode = jid.substring(0, 2);
-    if (regexp.test(jid)) {
+
-      const match = regexp.exec(jid);
+    if (Number(countryCode) === 52 || Number(countryCode) === 54) {
-      if (match && (match[1] === '52' || match[1] === '54')) {
+      if (jid.length === 13) {
-        const joker = Number.parseInt(match[3][0]);
+        const number = countryCode + jid.substring(3);
-        const ddd = Number.parseInt(match[2]);
+        return number;
-        if (joker < 7 || ddd < 11) {
-          return match[0];
-        }
-        return match[1] === '52' ? '52' + match[3] : '54' + match[3];
       }
+
+      return jid;
     }
     return jid;
   }
@@ -1177,6 +1363,7 @@ export class WAStartupService {
         }
         return match[1] + match[2] + match[3];
       }
+      return jid;
     } else {
       return jid;
     }
@@ -1184,6 +1371,7 @@ export class WAStartupService {
 
   private createJid(number: string): string {
     this.logger.verbose('Creating jid with number: ' + number);
+
     if (number.includes('@g.us') || number.includes('@s.whatsapp.net')) {
       this.logger.verbose('Number already contains @g.us or @s.whatsapp.net');
       return number;
@@ -1194,21 +1382,31 @@ export class WAStartupService {
       return number;
     }
 
-    const formattedBRNumber = this.formatBRNumber(number);
+    const countryCode = number.substring(0, 2);
-    if (formattedBRNumber !== number) {
+
-      this.logger.verbose(
+    if (Number(countryCode) === 55) {
-        'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`,
+      const formattedBRNumber = this.formatBRNumber(number);
-      );
+      if (formattedBRNumber !== number) {
-      return `${formattedBRNumber}@s.whatsapp.net`;
+        this.logger.verbose(
+          'Jid created is whatsapp in format BR: ' +
+            `${formattedBRNumber}@s.whatsapp.net`,
+        );
+        return `${formattedBRNumber}@s.whatsapp.net`;
+      }
     }
 
-    const formattedMXARNumber = this.formatMXOrARNumber(number);
+    if (Number(countryCode) === 52 || Number(countryCode) === 54) {
-    if (formattedMXARNumber !== number) {
+      console.log('numero mexicano');
-      this.logger.verbose(
+
-        'Jid created is whatsapp in format MXAR: ' +
+      const formattedMXARNumber = this.formatMXOrARNumber(number);
-          `${formattedMXARNumber}@s.whatsapp.net`,
+
-      );
+      if (formattedMXARNumber !== number) {
-      return `${formattedMXARNumber}@s.whatsapp.net`;
+        this.logger.verbose(
+          'Jid created is whatsapp in format MXAR: ' +
+            `${formattedMXARNumber}@s.whatsapp.net`,
+        );
+        return `${formattedMXARNumber}@s.whatsapp.net`;
+      }
     }
 
     if (number.includes('-')) {
@@ -1247,22 +1445,15 @@ export class WAStartupService {
     this.logger.verbose('Sending message with typing');
 
     const jid = this.createJid(number);
-    const isWA = (await this.whatsappNumber({ numbers: [jid] }))[0];
+    const numberWA = await this.whatsappNumber({ numbers: [jid] });
+    const isWA = numberWA[0];
+
     if (!isWA.exists && !isJidGroup(isWA.jid) && !isWA.jid.includes('@broadcast')) {
       throw new BadRequestException(isWA);
     }
 
     const sender = isJidGroup(jid) ? jid : isWA.jid;
 
-    if (isJidGroup(sender)) {
-      try {
-        this.logger.verbose('Getting group metadata');
-        await this.client.groupMetadata(sender);
-      } catch (error) {
-        throw new NotFoundException('Group not found');
-      }
-    }
-
     try {
       if (options?.delay) {
         this.logger.verbose('Delaying message');
@@ -1285,34 +1476,58 @@ export class WAStartupService {
       let quoted: WAMessage;
 
       if (options?.quoted) {
-        quoted = options?.quoted;
+        const m = options?.quoted;
+
+        const msg = m?.message
+          ? m
+          : ((await this.getMessage(m.key, true)) as proto.IWebMessageInfo);
+
+        if (!msg) {
+          throw 'Message not found';
+        }
+
+        quoted = msg;
         this.logger.verbose('Quoted message');
       }
 
       let mentions: string[];
-
+      if (isJidGroup(sender)) {
-      if (options?.mentions) {
+        try {
-        this.logger.verbose('Mentions defined');
-
-        if (!Array.isArray(options.mentions.mentioned) && !options.mentions.everyOne) {
-          throw new BadRequestException('Mentions must be an array');
-        }
-
-        if (options.mentions.everyOne) {
-          this.logger.verbose('Mentions everyone');
-
           const groupMetadata = await this.client.groupMetadata(sender);
-          mentions = groupMetadata.participants.map((participant) => participant.id);
+
-          this.logger.verbose('Getting group metadata for mentions');
+          if (!groupMetadata) {
-        } else {
+            throw new NotFoundException('Group not found');
-          this.logger.verbose('Mentions manually defined');
+          }
-          mentions = options.mentions.mentioned.map((mention) => {
+
-            const jid = this.createJid(mention);
+          if (options?.mentions) {
-            if (isJidGroup(jid)) {
+            this.logger.verbose('Mentions defined');
-              throw new BadRequestException('Mentions must be a number');
+
+            if (
+              !Array.isArray(options.mentions.mentioned) &&
+              !options.mentions.everyOne
+            ) {
+              throw new BadRequestException('Mentions must be an array');
             }
-            return jid;
+
-          });
+            if (options.mentions.everyOne) {
+              this.logger.verbose('Mentions everyone');
+
+              this.logger.verbose('Getting group metadata');
+              mentions = groupMetadata.participants.map((participant) => participant.id);
+              this.logger.verbose('Getting group metadata for mentions');
+            } else {
+              this.logger.verbose('Mentions manually defined');
+              mentions = options.mentions.mentioned.map((mention) => {
+                const jid = this.createJid(mention);
+                if (isJidGroup(jid)) {
+                  throw new BadRequestException('Mentions must be a number');
+                }
+                return jid;
+              });
+            }
+          }
+        } catch (error) {
+          throw new NotFoundException('Group not found');
         }
       }
 
@@ -1324,9 +1539,9 @@ export class WAStartupService {
         if (
           !message['audio'] &&
           !message['poll'] &&
-          !message['linkPreview'] &&
           !message['sticker'] &&
-          !sender.includes('@broadcast')
+          !message['conversation'] &&
+          sender !== 'status@broadcast'
         ) {
           if (!message['audio']) {
             this.logger.verbose('Sending message');
@@ -1344,20 +1559,20 @@ export class WAStartupService {
           }
         }
 
-        if (message['linkPreview']) {
+        if (message['conversation']) {
           this.logger.verbose('Sending message');
           return await this.client.sendMessage(
             sender,
             {
-              text: message['linkPreview'].text,
+              text: message['conversation'],
+              mentions,
             } as unknown as AnyMessageContent,
             option as unknown as MiscMessageGenerationOptions,
           );
         }
 
-        if (sender.includes('@broadcast')) {
+        if (sender === 'status@broadcast') {
           this.logger.verbose('Sending message');
-          console.log(message['status']);
           return await this.client.sendMessage(
             sender,
             message['status'].content as unknown as AnyMessageContent,
@@ -1392,6 +1607,14 @@ export class WAStartupService {
       this.logger.verbose('Sending data to webhook in event SEND_MESSAGE');
       await this.sendDataWebhook(Events.SEND_MESSAGE, messageRaw);
 
+      // if (this.localChatwoot.enabled) {
+      //   this.chatwootService.eventWhatsapp(
+      //     Events.SEND_MESSAGE,
+      //     { instanceName: this.instance.name },
+      //     messageRaw,
+      //   );
+      // }
+
       this.logger.verbose('Inserting message in database');
       await this.repository.message.insert(
         [messageRaw],
@@ -1424,19 +1647,6 @@ export class WAStartupService {
     );
   }
 
-  public async linkPreview(data: SendLinkPreviewDto) {
-    this.logger.verbose('Sending link preview');
-    return await this.sendMessageWithTyping(
-      data.number,
-      {
-        linkPreview: {
-          text: data.linkPreview.text,
-        },
-      },
-      data?.options,
-    );
-  }
-
   public async pollMessage(data: SendPollDto) {
     this.logger.verbose('Sending poll message');
     return await this.sendMessageWithTyping(
@@ -1572,8 +1782,10 @@ export class WAStartupService {
 
   public async statusMessage(data: SendStatusDto) {
     this.logger.verbose('Sending status message');
+    const status = await this.formatStatusMessage(data.statusMessage);
+
     return await this.sendMessageWithTyping('status@broadcast', {
-      status: await this.formatStatusMessage(data.statusMessage),
+      status,
     });
   }
 
@@ -1952,15 +2164,22 @@ export class WAStartupService {
     const onWhatsapp: OnWhatsAppDto[] = [];
     for await (const number of data.numbers) {
       const jid = this.createJid(number);
+      // const jid = `${number}@s.whatsapp.net`;
       if (isJidGroup(jid)) {
         const group = await this.findGroup({ groupJid: jid }, 'inner');
+
+        if (!group) throw new BadRequestException('Group not found');
+
         onWhatsapp.push(new OnWhatsAppDto(group.id, !!group?.id, group?.subject));
       } else {
-        try {
+        const verify = await this.client.onWhatsApp(jid);
-          const result = (await this.client.onWhatsApp(jid))[0];
+
+        const result = verify[0];
+
+        if (!result) {
+          onWhatsapp.push(new OnWhatsAppDto(jid, false));
+        } else {
           onWhatsapp.push(new OnWhatsAppDto(result.jid, result.exists));
-        } catch (error) {
-          onWhatsapp.push(new OnWhatsAppDto(number, false));
         }
       }
     }
@@ -2414,10 +2633,34 @@ export class WAStartupService {
     }
   }
 
-  public async fetchAllGroups() {
+  public async fetchAllGroups(getParticipants: GetParticipant) {
     this.logger.verbose('Fetching all groups');
     try {
-      return await this.client.groupFetchAllParticipating();
+      const fetch = Object.values(await this.client.groupFetchAllParticipating());
+
+      const groups = fetch.map((group) => {
+        const result = {
+          id: group.id,
+          subject: group.subject,
+          subjectOwner: group.subjectOwner,
+          subjectTime: group.subjectTime,
+          size: group.size,
+          creation: group.creation,
+          owner: group.owner,
+          desc: group.desc,
+          descId: group.descId,
+          restrict: group.restrict,
+          announce: group.announce,
+        };
+
+        if (getParticipants.getParticipants == 'true') {
+          result['participants'] = group.participants;
+        }
+
+        return result;
+      });
+
+      return groups;
     } catch (error) {
       throw new NotFoundException('Error fetching group', error.toString());
     }
@@ -2457,9 +2700,7 @@ export class WAStartupService {
       const msg = `${description}\n\n${inviteUrl}`;
 
       const message = {
-        linkPreview: {
+        conversation: msg,
-          text: msg,
-        },
       };
 
       for await (const number of numbers) {

src/whatsapp/types/wa.types.ts

@@ -6,10 +6,11 @@ export enum Events {
   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',
+  MESSAGES_DELETE = 'messages.delete',
+  SEND_MESSAGE = 'send.message',
   CONTACTS_SET = 'contacts.set',
   CONTACTS_UPSERT = 'contacts.upsert',
   CONTACTS_UPDATE = 'contacts.update',
@@ -41,6 +42,15 @@ export declare namespace wa {
     webhook_by_events?: boolean;
   };
 
+  export type LocalChatwoot = {
+    enabled?: boolean;
+    account_id?: string;
+    token?: string;
+    url?: string;
+    name_inbox?: string;
+    sign_msg?: boolean;
+  };
+
   export type StateConnection = {
     instance?: string;
     state?: WAConnectionState | 'refused';

src/whatsapp/whatsapp.module.ts

@@ -14,6 +14,8 @@ import { GroupController } from './controllers/group.controller';
 import { ViewsController } from './controllers/views.controller';
 import { WebhookService } from './services/webhook.service';
 import { WebhookController } from './controllers/webhook.controller';
+import { ChatwootService } from './services/chatwoot.service';
+import { ChatwootController } from './controllers/chatwoot.controller';
 import { RepositoryBroker } from './repository/repository.manager';
 import {
   AuthModel,
@@ -21,10 +23,12 @@ import {
   ContactModel,
   MessageModel,
   MessageUpModel,
+  ChatwootModel,
+  WebhookModel,
 } from './models';
 import { dbserver } from '../db/db.connect';
 import { WebhookRepository } from './repository/webhook.repository';
-import { WebhookModel } from './models/webhook.model';
+import { ChatwootRepository } from './repository/chatwoot.repository';
 import { AuthRepository } from './repository/auth.repository';
 import { WAStartupService } from './services/whatsapp.service';
 import { delay } from '@whiskeysockets/baileys';
@@ -38,6 +42,7 @@ const chatRepository = new ChatRepository(ChatModel, configService);
 const contactRepository = new ContactRepository(ContactModel, configService);
 const messageUpdateRepository = new MessageUpRepository(MessageUpModel, configService);
 const webhookRepository = new WebhookRepository(WebhookModel, configService);
+const chatwootRepository = new ChatwootRepository(ChatwootModel, configService);
 const authRepository = new AuthRepository(AuthModel, configService);
 
 export const repository = new RepositoryBroker(
@@ -46,6 +51,7 @@ export const repository = new RepositoryBroker(
   contactRepository,
   messageUpdateRepository,
   webhookRepository,
+  chatwootRepository,
   authRepository,
   configService,
   dbserver?.getClient(),
@@ -66,6 +72,10 @@ const webhookService = new WebhookService(waMonitor);
 
 export const webhookController = new WebhookController(webhookService);
 
+const chatwootService = new ChatwootService(waMonitor, configService);
+
+export const chatwootController = new ChatwootController(chatwootService, configService);
+
 export const instanceController = new InstanceController(
   waMonitor,
   configService,
@@ -73,6 +83,7 @@ export const instanceController = new InstanceController(
   eventEmitter,
   authService,
   webhookService,
+  chatwootService,
   cache,
 );
 export const viewsController = new ViewsController(waMonitor, configService);
@@ -105,6 +116,17 @@ export async function initInstance() {
       configService.get<Auth>('AUTHENTICATION').INSTANCE.WEBHOOK_URL;
     logger.verbose('Instance webhook: ' + instanceWebhook);
 
+    // const chatwootAccountId =
+    //   configService.get<Auth>('AUTHENTICATION').INSTANCE.CHATWOOT_ACCOUNT_ID;
+    // logger.verbose('Chatwoot account id: ' + chatwootAccountId);
+
+    // const chatwootToken =
+    //   configService.get<Auth>('AUTHENTICATION').INSTANCE.CHATWOOT_TOKEN;
+    // logger.verbose('Chatwoot token: ' + chatwootToken);
+
+    // const chatwootUrl = configService.get<Auth>('AUTHENTICATION').INSTANCE.CHATWOOT_URL;
+    // logger.verbose('Chatwoot url: ' + chatwootUrl);
+
     instance.instanceName = instanceName;
 
     waMonitor.waInstances[instance.instanceName] = instance;
@@ -126,6 +148,22 @@ export async function initInstance() {
       }
     }
 
+    // if (chatwootUrl && chatwootToken && chatwootAccountId) {
+    //   logger.verbose('Creating chatwoot for instance: ' + instanceName);
+    //   try {
+    //     chatwootService.create(instance, {
+    //       enabled: true,
+    //       url: chatwootUrl,
+    //       token: chatwootToken,
+    //       account_id: chatwootAccountId,
+    //       sign_msg: false,
+    //     });
+    //     logger.verbose('Chatwoot created');
+    //   } catch (error) {
+    //     logger.log(error);
+    //   }
+    // }
+
     try {
       const state = instance.connectionStatus?.state;
 

start.sh

@@ -6,6 +6,7 @@ then
   echo "DOCKER_ENV=$DOCKER_ENV"
   echo
 else
+  mkdir -p ./dist/src
   cp ./src/env.yml ./dist/src
 fi
 echo "> removing dist"