Merge branch 'EvolutionAPI:main' into main

.eslintrc.js

@@ -3,10 +3,14 @@ module.exports = {
   parserOptions: {
      sourceType: 'CommonJS',
   },
-  plugins: ['@typescript-eslint/eslint-plugin'],
+  plugins: [
+    '@typescript-eslint',
+    'simple-import-sort',
+    'import'
+  ],
   extends: [
+     'eslint:recommended',
      'plugin:@typescript-eslint/recommended',
-     'plugin:prettier/recommended',
      'plugin:prettier/recommended'
   ],
   globals: {
@@ -26,7 +30,11 @@ module.exports = {
      '@typescript-eslint/no-explicit-any': 'off',
      '@typescript-eslint/no-empty-function': 'off',
      '@typescript-eslint/no-non-null-assertion': 'off',
-     '@typescript-eslint/no-unused-vars': 'off',
+     '@typescript-eslint/no-unused-vars': 'error',
+     'import/first': 'error',
+     'import/no-duplicates': 'error',
+     'simple-import-sort/imports': 'error',
+     'simple-import-sort/exports': 'error',
      '@typescript-eslint/ban-types': [
         'error',
         {

.gitignore

@@ -16,16 +16,19 @@ lerna-debug.log*
 /docker-compose-data
 /docker-data
 
+docker-compose.yaml
+
 # Package
 /yarn.lock
 /package-lock.json
 
-# IDE - VSCode
+# IDEs
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.nova/*
 
 # Prisma
 /prisma/migrations
@@ -38,3 +41,6 @@ lerna-debug.log*
 /store
 
 /temp/*
+
+.DS_Store
+*.DS_Store

.prettierrc.js

@@ -2,8 +2,11 @@ module.exports = {
   semi: true,
   trailingComma: 'all',
   singleQuote: true,
-  printWidth: 90,
+  printWidth: 120,
+  arrowParens: 'always',
   tabWidth: 2,
-  bracketSameLine: true,
+  useTabs: false,
-  bracketSpacing: true
+  bracketSameLine: false,
+  bracketSpacing: true,
+  parser: 'typescript'
 }

CHANGELOG.md

@@ -1,16 +1,124 @@
+# 1.4.8 (2023-07-27 10:27)
+
+### Fixed
+
+* Fixed error return bug
+
+# 1.4.7 (2023-07-27 08:47)
+
+### Fixed
+
+* Fixed error return bug
+* Fixed problem of getting message when deleting message in chatwoot
+* Change in error return pattern
+
+# 1.4.6 (2023-07-26 17:54)
+
+### Fixed
+
+* Fixed bug of creating new inbox by chatwoot
+* When conversation reopens is pending when conversation pending is true
+* Added docker-compose file with dockerhub image
+
+# 1.4.5 (2023-07-26 09:32)
+
+### Fixed
+
+* Fixed problems in localization template in chatwoot
+* Fix mids going duplicated in chatwoot
+
+# 1.4.4 (2023-07-25 15:24)
+
+### Fixed
+
+* Fixed chatwoot line wrap issue
+* Solved receive location in chatwoot
+* When requesting the pairing code, it also brings the qr code
+* Option reopen_conversation in chatwoot endpoint
+* Option conversation_pending in chatwoot endpoint
+
+# 1.4.3 (2023-07-25 10:51)
+
+### Fixed
+
+* Adjusts in settings with options always_online, read_messages and read_status
+* Fixed send webhook for event CALL
+* Create instance with settings
+
+# 1.4.2 (2023-07-24 20:52)
+
+### Fixed
+
+* Fixed validation is set settings 
+* Adjusts in group validations
+* Ajusts in sticker message to chatwoot
+
+# 1.4.1 (2023-07-24 18:28)
+
+### Fixed
+
+* Fixed reconnect with pairing code or qrcode
+* Fixed problem in createJid
+
+# 1.4.0 (2023-07-24 17:03)
+
+### Features
+
+* Added connection functionality via pairing code
+* Added fetch profile endpoint in chat controller
+* Created settings controller
+* Added reject call and send text message when receiving a call
+* Added setting to ignore group messages
+* Added connection with pairing code in chatwoot with command /init:{NUMBER}
+* Added encoding option in endpoint sendWhatsAppAudio
+
+### Fixed
+
+* Added link preview option in send text message
+* Fixed problem with fileSha256 appearing when sending a sticker in chatwoot
+* Fixed issue where it was not possible to open a conversation when sent at first by me on my cell phone in chatwoot
+* Now it only updates the contact name if it is the same as the phone number in chatwoot
+* Now accepts all chatwoot inbox templates
+* Command to create new instances set to /new_instance:{NAME}:{NUMBER}
+* Fix in chatwoot set, sign msg can now be disabled
+
+### Integrations
+
+- Chatwoot: v2.18.0 - v3.0.0 (Beta)
+
+# 1.3.2 (2023-07-21 17:19)
+
+### Fixed
+
+* Fix in update settings that needed to restart after updated
+* Correction in the use of the api with mongodb
+* Adjustments to search endpoint for contacts, chats, messages and Status messages
+* Now when deleting the instance, the data referring to it in mongodb is also deleted
+* It is now validated if the instance name contains uppercase and special characters
+* For compatibility reasons, container mode has been removed
+* Added docker-compose files example
+
+### Integrations
+
+- Chatwoot: v2.18.0
+
 # 1.3.1 (2023-07-20 07:48)
 
 ### Fixed
 
 * Adjust in create store files
 
+### Integrations
+
+- Chatwoot: v2.18.0
+
 # 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>'
+* 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

Docker/.env.example

@@ -1,13 +1,13 @@
 # Server URL - Set your application url
-SERVER_URL='http://localhost:8080'
+SERVER_URL=http://localhost:8080
 
 # Cors - * for all or set separate by commas -  ex.: 'yourdomain1.com, yourdomain2.com'
-CORS_ORIGIN='*'
+CORS_ORIGIN=*
-CORS_METHODS='POST,GET,PUT,DELETE'
+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_LEVEL=ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS
 LOG_COLOR=true
 # Log Baileys - "fatal" | "error" | "warn" | "info" | "debug" | "trace"
 LOG_BAILEYS=error
@@ -31,9 +31,9 @@ CLEAN_STORE_CONTACTS=true
 CLEAN_STORE_CHATS=true
 
 # Permanent data storage
-DATABASE_ENABLED=false
+DATABASE_ENABLED=true
 DATABASE_CONNECTION_URI=mongodb://root:root@mongodb:27017/?authSource=admin&readPreference=primary&ssl=false&directConnection=true
-DATABASE_CONNECTION_DB_PREFIX_NAME=evolution
+DATABASE_CONNECTION_DB_PREFIX_NAME=evdocker
 
 # Choose the data you want to save in the application's database or store
 DATABASE_SAVE_DATA_INSTANCE=false
@@ -42,9 +42,9 @@ DATABASE_SAVE_MESSAGE_UPDATE=false
 DATABASE_SAVE_DATA_CONTACTS=false
 DATABASE_SAVE_DATA_CHATS=false
 
-REDIS_ENABLED=false
+REDIS_ENABLED=true
 REDIS_URI=redis://redis:6379
-REDIS_PREFIX_KEY=evolution
+REDIS_PREFIX_KEY=evdocker
 
 # Global Webhook Settings
 # Each instance's Webhook URL and events will be requested at the time it is created
@@ -73,11 +73,12 @@ WEBHOOK_EVENTS_GROUPS_UPSERT=true
 WEBHOOK_EVENTS_GROUPS_UPDATE=true
 WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE=true
 WEBHOOK_EVENTS_CONNECTION_UPDATE=true
+WEBHOOK_EVENTS_CALL=true
 # This event fires every time a new token is requested via the refresh route
 WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 
 # Name that will be displayed on smartphone connection
-CONFIG_SESSION_PHONE_CLIENT='Evolution API'
+CONFIG_SESSION_PHONE_CLIENT=EvolutionAPI
 # Browser Name = chrome | firefox | edge | opera | safari
 CONFIG_SESSION_PHONE_NAME=chrome
 
@@ -88,22 +89,12 @@ QRCODE_LIMIT=30
 # 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'
+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_API_KEY=B6D711FCDE4D4FD5936544120E713976
 AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true
 ## Set the secret key to encrypt and decrypt your token and its expiration time
 # seconds - 3600s ===1h | zero (0) - never expires
 AUTHENTICATION_JWT_EXPIRIN_IN=0
-AUTHENTICATION_JWT_SECRET='L0YWtjb2w554WFqPG'
+AUTHENTICATION_JWT_SECRET='L=0YWt]b2w[WF>#>:&E`'
-# 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
-# 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=''
-AUTHENTICATION_INSTANCE_CHATWOOT_ACCOUNT_ID=1
-AUTHENTICATION_INSTANCE_CHATWOOT_TOKEN=123456
-AUTHENTICATION_INSTANCE_CHATWOOT_URL=''

Docker/redis/docker-compose.yaml

@@ -13,13 +13,6 @@ services:
     ports:
       - 6379:6379
     
-  rebrow:
-    image: marian/rebrow
-    ports: 
-      - 5001:5001
-    links:
-      - redis
-    
 volumes:
   evolution_redis:
 

Dockerfile

@@ -13,7 +13,7 @@ COPY ./package.json .
 
 ENV DOCKER_ENV=true
 
-ENV SERVER_URL='http://localhost:8080'
+ENV SERVER_URL=http://localhost:8080
 
 ENV CORS_ORIGIN=*
 ENV CORS_METHODS=POST,GET,PUT,DELETE
@@ -74,10 +74,11 @@ 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 WEBHOOK_EVENTS_CALL=true
 
 ENV WEBHOOK_EVENTS_NEW_JWT_TOKEN=false
 
-ENV CONFIG_SESSION_PHONE_CLIENT='Evolution API'
+ENV CONFIG_SESSION_PHONE_CLIENT=EvolutionAPI
 ENV CONFIG_SESSION_PHONE_NAME=chrome
 
 ENV QRCODE_LIMIT=30

docker-compose.yaml.example

@@ -0,0 +1,28 @@
+version: '3.3'
+
+services:
+  api:
+    container_name: evolution_api
+    image: evolution/api:local
+    restart: always
+    ports:
+      - 8080:8080
+    volumes:
+      - evolution_instances:/evolution/instances
+      - evolution_store:/evolution/store
+    networks:
+      - evolution-net
+    env_file:
+      - ./Docker/.env
+    command: ['node', './dist/src/main.js']
+    expose:
+      - 8080
+
+volumes:
+  evolution_instances:
+  evolution_store:
+
+networks:
+  evolution-net:
+    external: true
+  

docker-compose.yaml.example.complete

@@ -0,0 +1,79 @@
+version: '3.3'
+
+services:
+  api:
+    container_name: evolution_api
+    image: evolution/api:local
+    restart: always
+    ports:
+      - 8080:8080
+    volumes:
+      - evolution_instances:/evolution/instances
+      - evolution_store:/evolution/store
+    networks:
+      - evolution-net
+    env_file:
+      - ./Docker/.env
+    command: ['node', './dist/src/main.js']
+    expose:
+      - 8080
+
+  mongodb:
+    container_name: mongodb
+    image: mongo
+    restart: always
+    ports:
+      - 27017:27017
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=root
+      - MONGO_INITDB_ROOT_PASSWORD=root
+      - PUID=1000
+      - PGID=1000
+    volumes:
+      - evolution_mongodb_data:/data/db
+      - evolution_mongodb_configdb:/data/configdb
+    networks:
+      - evolution-net
+    expose:
+      - 27017
+
+  mongo-express:
+    image: mongo-express
+    networks:
+      - evolution-net
+    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
+
+  redis:
+    image: redis:latest
+    container_name: redis
+    command: >
+      redis-server
+      --port 6379
+      --appendonly yes
+    volumes:
+      - evolution_redis:/data
+    networks:
+      - evolution-net
+    ports:
+      - 6379:6379
+
+volumes:
+  evolution_instances:
+  evolution_store:
+  evolution_mongodb_data:
+  evolution_mongodb_configdb:
+  evolution_redis:
+
+networks:
+  evolution-net:
+    external: true
+  

docker-compose.yaml.example.dockerhub

@@ -0,0 +1,28 @@
+version: '3.3'
+
+services:
+  api:
+    container_name: evolution_api
+    image: davidsongomes/evolution-api:latest
+    restart: always
+    ports:
+      - 8080:8080
+    volumes:
+      - evolution_instances:/evolution/instances
+      - evolution_store:/evolution/store
+    networks:
+      - evolution-net
+    env_file:
+      - ./Docker/.env
+    command: ['node', './dist/src/main.js']
+    expose:
+      - 8080
+
+volumes:
+  evolution_instances:
+  evolution_store:
+
+networks:
+  evolution-net:
+    external: true
+  

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.3.0",
+  "version": "1.4.8",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -8,7 +8,8 @@
     "start": "ts-node --files --transpile-only ./src/main.ts",
     "start:prod": "bash start.sh",
     "dev:server": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./src/main.ts",
-    "test": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts"
+    "test": "clear && tsnd --files --transpile-only --respawn --ignore-watch node_modules ./test/all.test.ts",
+    "lint": "eslint --fix --ext .ts src"
   },
   "repository": {
     "type": "git",
@@ -45,7 +46,7 @@
     "@figuro/chatwoot-sdk": "^1.1.14",
     "@hapi/boom": "^10.0.1",
     "@sentry/node": "^7.59.2",
-    "@whiskeysockets/baileys": "^6.4.0",
+    "@whiskeysockets/baileys": "github:EvolutionAPI/Baileys",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
     "compression": "^1.7.4",
@@ -81,17 +82,20 @@
     "@types/express": "^4.17.17",
     "@types/js-yaml": "^4.0.5",
     "@types/jsonwebtoken": "^8.5.9",
+    "@types/mime-types": "^2.1.1",
     "@types/node": "^18.15.11",
     "@types/node-windows": "^0.1.2",
     "@types/qrcode": "^1.5.0",
     "@types/qrcode-terminal": "^0.12.0",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.57.1",
+    "@typescript-eslint/parser": "^5.62.0",
-    "eslint": "^8.38.0",
+    "eslint": "^8.45.0",
     "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.8.7",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "prettier": "^2.8.8",
     "ts-node-dev": "^2.0.0",
     "typescript": "^4.9.5"
   }

src/config/env.config.ts

@@ -1,7 +1,7 @@
+import { isBooleanString } from 'class-validator';
 import { readFileSync } from 'fs';
 import { load } from 'js-yaml';
 import { join } from 'path';
-import { isBooleanString } from 'class-validator';
 
 export type HttpServer = { TYPE: 'http' | 'https'; PORT: number; URL: string };
 
@@ -14,15 +14,7 @@ export type Cors = {
 
 export type LogBaileys = 'fatal' | 'error' | 'warn' | 'info' | 'debug' | 'trace';
 
-export type LogLevel =
+export type LogLevel = 'ERROR' | 'WARN' | 'DEBUG' | 'INFO' | 'LOG' | 'VERBOSE' | 'DARK' | 'WEBHOOKS';
-  | 'ERROR'
-  | 'WARN'
-  | 'DEBUG'
-  | 'INFO'
-  | 'LOG'
-  | 'VERBOSE'
-  | 'DARK'
-  | 'WEBHOOKS';
 
 export type Log = {
   LEVEL: LogLevel[];
@@ -89,25 +81,18 @@ export type EventsWebhook = {
   GROUPS_UPSERT: boolean;
   GROUP_UPDATE: boolean;
   GROUP_PARTICIPANTS_UPDATE: boolean;
+  CALL: boolean;
   NEW_JWT_TOKEN: boolean;
 };
 
 export type ApiKey = { KEY: string };
 export type Jwt = { EXPIRIN_IN: number; SECRET: string };
-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;
   EXPOSE_IN_FETCH_INSTANCES: boolean;
   JWT: Jwt;
   TYPE: 'jwt' | 'apikey';
-  INSTANCE: Instance;
 };
 
 export type DelInstance = number | boolean;
@@ -163,9 +148,7 @@ export class ConfigService {
   }
 
   private envYaml(): Env {
-    return load(
+    return load(readFileSync(join(process.cwd(), 'src', 'env.yml'), { encoding: 'utf-8' })) as Env;
-      readFileSync(join(process.cwd(), 'src', 'env.yml'), { encoding: 'utf-8' }),
-    ) as Env;
   }
 
   private envProcess(): Env {
@@ -251,8 +234,8 @@ export class ConfigService {
           CONNECTION_UPDATE: process.env?.WEBHOOK_EVENTS_CONNECTION_UPDATE === 'true',
           GROUPS_UPSERT: process.env?.WEBHOOK_EVENTS_GROUPS_UPSERT === 'true',
           GROUP_UPDATE: process.env?.WEBHOOK_EVENTS_GROUPS_UPDATE === 'true',
-          GROUP_PARTICIPANTS_UPDATE:
+          GROUP_PARTICIPANTS_UPDATE: process.env?.WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
-            process.env?.WEBHOOK_EVENTS_GROUP_PARTICIPANTS_UPDATE === 'true',
+          CALL: process.env?.WEBHOOK_EVENTS_CALL === 'true',
           NEW_JWT_TOKEN: process.env?.WEBHOOK_EVENTS_NEW_JWT_TOKEN === 'true',
         },
       },
@@ -268,23 +251,13 @@ export class ConfigService {
         API_KEY: {
           KEY: process.env.AUTHENTICATION_API_KEY,
         },
-        EXPOSE_IN_FETCH_INSTANCES:
+        EXPOSE_IN_FETCH_INSTANCES: process.env?.AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES === 'true',
-          process.env?.AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES === 'true',
         JWT: {
           EXPIRIN_IN: Number.isInteger(process.env?.AUTHENTICATION_JWT_EXPIRIN_IN)
             ? Number.parseInt(process.env.AUTHENTICATION_JWT_EXPIRIN_IN)
             : 3600,
           SECRET: process.env.AUTHENTICATION_JWT_SECRET,
         },
-        INSTANCE: {
-          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/config/logger.config.ts

@@ -1,6 +1,7 @@
-import { configService, Log } from './env.config';
 import dayjs from 'dayjs';
 
+import { configService, Log } from './env.config';
+
 const formatDateLog = (timestamp: number) =>
   dayjs(timestamp)
     .toDate()

src/db/db.connect.ts

@@ -1,4 +1,5 @@
 import mongoose from 'mongoose';
+
 import { configService, Database } from '../config/env.config';
 import { Logger } from '../config/logger.config';
 

src/db/redis.client.ts

@@ -1,7 +1,8 @@
 import { createClient, RedisClientType } from '@redis/client';
-import { Logger } from '../config/logger.config';
 import { BufferJSON } from '@whiskeysockets/baileys';
+
 import { Redis } from '../config/env.config';
+import { Logger } from '../config/logger.config';
 
 export class RedisCache {
   constructor() {
@@ -59,11 +60,7 @@ export class RedisCache {
       this.logger.verbose('writeData: ' + field);
       const json = JSON.stringify(data, BufferJSON.replacer);
 
-      return await this.client.hSet(
+      return await this.client.hSet(this.redisEnv.PREFIX_KEY + ':' + this.instanceName, field, json);
-        this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
-        field,
-        json,
-      );
     } catch (error) {
       this.logger.error(error);
     }
@@ -72,10 +69,7 @@ export class RedisCache {
   public async readData(field: string) {
     try {
       this.logger.verbose('readData: ' + field);
-      const data = await this.client.hGet(
+      const data = await this.client.hGet(this.redisEnv.PREFIX_KEY + ':' + this.instanceName, field);
-        this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
-        field,
-      );
 
       if (data) {
         this.logger.verbose('readData: ' + field + ' success');
@@ -92,10 +86,7 @@ export class RedisCache {
   public async removeData(field: string) {
     try {
       this.logger.verbose('removeData: ' + field);
-      return await this.client.hDel(
+      return await this.client.hDel(this.redisEnv.PREFIX_KEY + ':' + this.instanceName, field);
-        this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
-        field,
-      );
     } catch (error) {
       this.logger.error(error);
     }
@@ -104,9 +95,7 @@ export class RedisCache {
   public async delAll(hash?: string) {
     try {
       this.logger.verbose('instance delAll: ' + hash);
-      const result = await this.client.del(
+      const result = await this.client.del(hash || this.redisEnv.PREFIX_KEY + ':' + this.instanceName);
-        hash || this.redisEnv.PREFIX_KEY + ':' + this.instanceName,
-      );
 
       return result;
     } catch (error) {

src/dev-env.yml

@@ -110,6 +110,7 @@ WEBHOOK:
     GROUP_UPDATE: true
     GROUP_PARTICIPANTS_UPDATE: true
     CONNECTION_UPDATE: true
+    CALL: true
     # This event fires every time a new token is requested via the refresh route
     NEW_JWT_TOKEN: false
 
@@ -137,13 +138,3 @@ AUTHENTICATION:
   JWT:
     EXPIRIN_IN: 0 # seconds - 3600s === 1h | zero (0) - never expires
     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
-    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/exceptions/401.exception.ts

@@ -5,7 +5,7 @@ export class UnauthorizedException {
     throw {
       status: HttpStatus.UNAUTHORIZED,
       error: 'Unauthorized',
-      message: objectError.length > 0 ? objectError : undefined,
+      message: objectError.length > 0 ? objectError : 'Unauthorized',
     };
   }
 }

src/main.ts

@@ -1,16 +1,17 @@
+import 'express-async-errors';
+
 import compression from 'compression';
-import { configService, Cors, HttpServer } from './config/env.config';
 import cors from 'cors';
 import express, { json, NextFunction, Request, Response, urlencoded } from 'express';
 import { join } from 'path';
+
+import { configService, Cors, HttpServer } from './config/env.config';
 import { onUnexpectedError } from './config/error.config';
 import { Logger } from './config/logger.config';
 import { ROOT_DIR } from './config/path.config';
-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';
+import { HttpStatus, router } from './whatsapp/routers/index.router';
+import { waMonitor } from './whatsapp/whatsapp.module';
 
 function initWA() {
   waMonitor.loadInstance();
@@ -20,27 +21,6 @@ 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) {
@@ -65,26 +45,29 @@ 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) {
-        return res.status(err['status'] || 500).json(err);
+        return res.status(err['status'] || 500).json({
+          status: err['status'] || 500,
+          error: err['error'] || 'Internal Server Error',
+          response: {
+            message: err['message'] || 'Internal Server Error',
+          },
+        });
       }
+
+      next();
     },
     (req: Request, res: Response, next: NextFunction) => {
       const { method, url } = req;
 
       res.status(HttpStatus.NOT_FOUND).json({
         status: HttpStatus.NOT_FOUND,
-        message: `Cannot ${method.toUpperCase()} ${url}`,
         error: 'Not Found',
+        response: {
+          message: [`Cannot ${method.toUpperCase()} ${url}`],
+        },
       });
 
       next();
@@ -96,9 +79,7 @@ function bootstrap() {
   ServerUP.app = app;
   const server = ServerUP[httpServer.TYPE];
 
-  server.listen(httpServer.PORT, () =>
+  server.listen(httpServer.PORT, () => logger.log(httpServer.TYPE.toUpperCase() + ' - ON: ' + httpServer.PORT));
-    logger.log(httpServer.TYPE.toUpperCase() + ' - ON: ' + httpServer.PORT),
-  );
 
   initWA();
 

src/utils/server-up.ts

@@ -1,8 +1,9 @@
 import { Express } from 'express';
 import { readFileSync } from 'fs';
-import { configService, SslConf } from '../config/env.config';
-import * as https from 'https';
 import * as http from 'http';
+import * as https from 'https';
+
+import { configService, SslConf } from '../config/env.config';
 
 export class ServerUP {
   static #app: Express;

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

@@ -6,6 +6,7 @@ import {
   proto,
   SignalDataTypeMap,
 } from '@whiskeysockets/baileys';
+
 import { configService, Database } from '../config/env.config';
 import { Logger } from '../config/logger.config';
 import { dbserver } from '../db/db.connect';
@@ -24,12 +25,12 @@ export async function useMultiFileAuthStateDb(
   const writeData = async (data: any, key: string): Promise<any> => {
     try {
       await client.connect();
-      return await collection.replaceOne(
+      return await collection.replaceOne({ _id: key }, JSON.parse(JSON.stringify(data, BufferJSON.replacer)), {
-        { _id: key },
+        upsert: true,
-        JSON.parse(JSON.stringify(data, BufferJSON.replacer)),
+      });
-        { upsert: true },
+    } catch (error) {
-      );
+      logger.error(error);
-    } catch {}
+    }
   };
 
   const readData = async (key: string): Promise<any> => {
@@ -38,14 +39,18 @@ export async function useMultiFileAuthStateDb(
       const data = await collection.findOne({ _id: key });
       const creds = JSON.stringify(data);
       return JSON.parse(creds, BufferJSON.reviver);
-    } catch {}
+    } catch (error) {
+      logger.error(error);
+    }
   };
 
   const removeData = async (key: string) => {
     try {
       await client.connect();
       return await collection.deleteOne({ _id: key });
-    } catch {}
+    } catch (error) {
+      logger.error(error);
+    }
   };
 
   const creds: AuthenticationCreds = (await readData('creds')) || initAuthCreds();

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

@@ -5,9 +5,9 @@ import {
   proto,
   SignalDataTypeMap,
 } from '@whiskeysockets/baileys';
-import { RedisCache } from '../db/redis.client';
+
 import { Logger } from '../config/logger.config';
-import { Redis } from '../config/env.config';
+import { RedisCache } from '../db/redis.client';
 
 export async function useMultiFileAuthStateRedisDb(cache: RedisCache): Promise<{
   state: AuthenticationState;

src/validate/validate.schema.ts

@@ -53,11 +53,13 @@ export const instanceNameSchema: JSONSchema7 = {
           'GROUP_UPDATE',
           'GROUP_PARTICIPANTS_UPDATE',
           'CONNECTION_UPDATE',
+          'CALL',
           'NEW_JWT_TOKEN',
         ],
       },
     },
     qrcode: { type: 'boolean', enum: [true, false] },
+    number: { type: 'string', pattern: '^\\d+[\\.@\\w-]+' },
     token: { type: 'string' },
   },
   ...isNotEmpty('instanceName'),
@@ -123,7 +125,6 @@ const optionsSchema: JSONSchema7 = {
 
 const numberDefinition: JSONSchema7Definition = {
   type: 'string',
-  pattern: '^\\d+[\\.@\\w-]+',
   description: 'Invalid format',
 };
 
@@ -398,7 +399,7 @@ export const contactMessageSchema: JSONSchema7 = {
           email: { type: 'string' },
           url: { type: 'string' },
         },
-        required: ['fullName', 'wuid', 'phoneNumber'],
+        required: ['fullName', 'phoneNumber'],
         ...isNotEmpty('fullName'),
       },
       minItems: 1,
@@ -445,7 +446,6 @@ export const whatsappNumberSchema: JSONSchema7 = {
       uniqueItems: true,
       items: {
         type: 'string',
-        pattern: '^\\d+',
         description: '"numbers" must be an array of numeric strings',
       },
     },
@@ -456,7 +456,7 @@ export const readMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
   properties: {
-    readMessages: {
+    read_messages: {
       type: 'array',
       minItems: 1,
       uniqueItems: true,
@@ -471,7 +471,7 @@ export const readMessageSchema: JSONSchema7 = {
       },
     },
   },
-  required: ['readMessages'],
+  required: ['read_messages'],
 };
 
 export const privacySettingsSchema: JSONSchema7 = {
@@ -587,6 +587,17 @@ export const profilePictureSchema: JSONSchema7 = {
   },
 };
 
+export const profileSchema: JSONSchema7 = {
+  type: 'object',
+  properties: {
+    wuid: { type: 'string' },
+    name: { type: 'string' },
+    picture: { type: 'string' },
+    status: { type: 'string' },
+    isBusiness: { type: 'boolean' },
+  },
+};
+
 export const messageValidateSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
@@ -657,6 +668,7 @@ export const createGroupSchema: JSONSchema7 = {
     subject: { type: 'string' },
     description: { type: 'string' },
     profilePicture: { type: 'string' },
+    promoteParticipants: { type: 'boolean', enum: [true, false] },
     participants: {
       type: 'array',
       minItems: 1,
@@ -843,6 +855,7 @@ export const webhookSchema: JSONSchema7 = {
           'GROUP_UPDATE',
           'GROUP_PARTICIPANTS_UPDATE',
           'CONNECTION_UPDATE',
+          'CALL',
           'NEW_JWT_TOKEN',
         ],
       },
@@ -861,7 +874,24 @@ export const chatwootSchema: JSONSchema7 = {
     token: { type: 'string' },
     url: { type: 'string' },
     sign_msg: { type: 'boolean', enum: [true, false] },
+    reopen_conversation: { type: 'boolean', enum: [true, false] },
+    conversation_pending: { type: 'boolean', enum: [true, false] },
   },
-  required: ['enabled', 'account_id', 'token', 'url', 'sign_msg'],
+  required: ['enabled', 'account_id', 'token', 'url', 'sign_msg', 'reopen_conversation', 'conversation_pending'],
-  ...isNotEmpty('account_id', 'token', 'url', 'sign_msg'),
+  ...isNotEmpty('account_id', 'token', 'url', 'sign_msg', 'reopen_conversation', 'conversation_pending'),
+};
+
+export const settingsSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    reject_call: { type: 'boolean', enum: [true, false] },
+    msg_call: { type: 'string' },
+    groups_ignore: { type: 'boolean', enum: [true, false] },
+    always_online: { type: 'boolean', enum: [true, false] },
+    read_messages: { type: 'boolean', enum: [true, false] },
+    read_status: { type: 'boolean', enum: [true, false] },
+  },
+  required: ['reject_call', 'groups_ignore', 'always_online', 'read_messages', 'read_status'],
+  ...isNotEmpty('reject_call', 'groups_ignore', 'always_online', 'read_messages', 'read_status'),
 };

src/whatsapp/abstract/abstract.repository.ts

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
+
 import { ConfigService, Database } from '../../config/env.config';
 import { ROOT_DIR } from '../../config/path.config';
 
@@ -34,11 +35,9 @@ export abstract class Repository implements IRepository {
       mkdirSync(create.path, { recursive: true });
     }
     try {
-      writeFileSync(
+      writeFileSync(join(create.path, create.fileName + '.json'), JSON.stringify({ ...create.data }), {
-        join(create.path, create.fileName + '.json'),
+        encoding: 'utf-8',
-        JSON.stringify({ ...create.data }),
+      });
-        { encoding: 'utf-8' },
-      );
 
       return { message: 'create - success' };
     } finally {
@@ -46,19 +45,23 @@ export abstract class Repository implements IRepository {
     }
   };
 
-  public insert(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
+  // eslint-disable-next-line
+    public insert(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
     throw new Error('Method not implemented.');
   }
 
-  public update(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
+  // eslint-disable-next-line
+    public update(data: any, instanceName: string, saveDb = false): Promise<IInsert> {
     throw new Error('Method not implemented.');
   }
 
-  public find(query: any): Promise<any> {
+  // eslint-disable-next-line
+    public find(query: any): Promise<any> {
     throw new Error('Method not implemented.');
   }
 
-  delete(query: any, force?: boolean): Promise<any> {
+  // eslint-disable-next-line
+    delete(query: any, force?: boolean): Promise<any> {
     throw new Error('Method not implemented.');
   }
 }

src/whatsapp/abstract/abstract.router.ts

@@ -1,11 +1,13 @@
-import { InstanceDto } from '../dto/instance.dto';
-import { JSONSchema7 } from 'json-schema';
-import { Request } from 'express';
-import { validate } from 'jsonschema';
-import { BadRequestException } from '../../exceptions';
 import 'express-async-errors';
+
+import { Request } from 'express';
+import { JSONSchema7 } from 'json-schema';
+import { validate } from 'jsonschema';
+
 import { Logger } from '../../config/logger.config';
-import { GetParticipant, GroupInvite, GroupJid } from '../dto/group.dto';
+import { BadRequestException } from '../../exceptions';
+import { GetParticipant, GroupInvite } from '../dto/group.dto';
+import { InstanceDto } from '../dto/instance.dto';
 
 type DataValidate<T> = {
   request: Request;
@@ -46,20 +48,21 @@ export abstract class RouterBroker {
     const v = schema ? validate(ref, schema) : { valid: true, errors: [] };
 
     if (!v.valid) {
-      const message: any[] = v.errors.map(({ property, stack, schema }) => {
+      const message: any[] = v.errors.map(({ stack, schema }) => {
         let message: string;
         if (schema['description']) {
           message = schema['description'];
         } else {
           message = stack.replace('instance.', '');
         }
-        return {
+        return message;
-          property: property.replace('instance.', ''),
+        // return {
-          message,
+        //   property: property.replace('instance.', ''),
-        };
+        //   message,
+        // };
       });
-      logger.error([...message]);
+      logger.error(message);
-      throw new BadRequestException(...message);
+      throw new BadRequestException(message);
     }
 
     return await execute(instance, ref);
@@ -99,21 +102,29 @@ export abstract class RouterBroker {
   public async groupValidate<T>(args: DataValidate<T>) {
     const { request, ClassRef, schema, execute } = args;
 
-    const groupJid = request.query as unknown as GroupJid;
-
-    if (!groupJid?.groupJid) {
-      throw new BadRequestException(
-        'The group id needs to be informed in the query',
-        'ex: "groupJid=120362@g.us"',
-      );
-    }
-
     const instance = request.params as unknown as InstanceDto;
     const body = request.body;
 
+    let groupJid = body?.groupJid;
+
+    if (!groupJid) {
+      if (request.query?.groupJid) {
+        groupJid = request.query.groupJid;
+      } else {
+        throw new BadRequestException('The group id needs to be informed in the query', 'ex: "groupJid=120362@g.us"');
+      }
+    }
+
+    if (!groupJid.endsWith('@g.us')) {
+      groupJid = groupJid + '@g.us';
+    }
+
+    Object.assign(body, {
+      groupJid: groupJid,
+    });
+
     const ref = new ClassRef();
 
-    Object.assign(body, groupJid);
     Object.assign(ref, body);
 
     const v = validate(ref, schema);
@@ -186,9 +197,7 @@ export abstract class RouterBroker {
     const getParticipants = request.query as unknown as GetParticipant;
 
     if (!getParticipants?.getParticipants) {
-      throw new BadRequestException(
+      throw new BadRequestException('The getParticipants needs to be informed in the query');
-        'The getParticipants needs to be informed in the query',
-      );
     }
 
     const instance = request.params as unknown as InstanceDto;

src/whatsapp/controllers/chat.controller.ts

@@ -1,7 +1,8 @@
-import { proto } from '@whiskeysockets/baileys';
+import { Logger } from '../../config/logger.config';
 import {
   ArchiveChatDto,
   DeleteMessage,
+  getBase64FromMediaMessageDto,
   NumberDto,
   PrivacySettingDto,
   ProfileNameDto,
@@ -9,14 +10,12 @@ import {
   ProfileStatusDto,
   ReadMessageDto,
   WhatsAppNumberDto,
-  getBase64FromMediaMessageDto,
 } from '../dto/chat.dto';
 import { InstanceDto } from '../dto/instance.dto';
 import { ContactQuery } from '../repository/contact.repository';
 import { MessageQuery } from '../repository/message.repository';
 import { MessageUpQuery } from '../repository/messageUp.repository';
 import { WAMonitoringService } from '../services/monitor.service';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('ChatController');
 
@@ -48,18 +47,18 @@ export class ChatController {
     return await this.waMonitor.waInstances[instanceName].profilePicture(data.number);
   }
 
+  public async fetchProfile({ instanceName }: InstanceDto, data: NumberDto) {
+    logger.verbose('requested fetchProfile from ' + instanceName + ' instance');
+    return await this.waMonitor.waInstances[instanceName].fetchProfile(instanceName, data.number);
+  }
+
   public async fetchContacts({ instanceName }: InstanceDto, query: ContactQuery) {
     logger.verbose('requested fetchContacts from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchContacts(query);
   }
 
-  public async getBase64FromMediaMessage(
+  public async getBase64FromMediaMessage({ instanceName }: InstanceDto, data: getBase64FromMediaMessageDto) {
-    { instanceName }: InstanceDto,
+    logger.verbose('requested getBase64FromMediaMessage from ' + instanceName + ' instance');
-    data: getBase64FromMediaMessageDto,
-  ) {
-    logger.verbose(
-      'requested getBase64FromMediaMessage from ' + instanceName + ' instance',
-    );
     return await this.waMonitor.waInstances[instanceName].getBase64FromMediaMessage(data);
   }
 
@@ -83,22 +82,14 @@ export class ChatController {
     return await this.waMonitor.waInstances[instanceName].fetchPrivacySettings();
   }
 
-  public async updatePrivacySettings(
+  public async updatePrivacySettings({ instanceName }: InstanceDto, data: PrivacySettingDto) {
-    { instanceName }: InstanceDto,
-    data: PrivacySettingDto,
-  ) {
     logger.verbose('requested updatePrivacySettings from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].updatePrivacySettings(data);
   }
 
-  public async fetchBusinessProfile(
+  public async fetchBusinessProfile({ instanceName }: InstanceDto, data: ProfilePictureDto) {
-    { instanceName }: InstanceDto,
-    data: ProfilePictureDto,
-  ) {
     logger.verbose('requested fetchBusinessProfile from ' + instanceName + ' instance');
-    return await this.waMonitor.waInstances[instanceName].fetchBusinessProfile(
+    return await this.waMonitor.waInstances[instanceName].fetchBusinessProfile(data.number);
-      data.number,
-    );
   }
 
   public async updateProfileName({ instanceName }: InstanceDto, data: ProfileNameDto) {
@@ -106,30 +97,17 @@ export class ChatController {
     return await this.waMonitor.waInstances[instanceName].updateProfileName(data.name);
   }
 
-  public async updateProfileStatus(
+  public async updateProfileStatus({ instanceName }: InstanceDto, data: ProfileStatusDto) {
-    { instanceName }: InstanceDto,
-    data: ProfileStatusDto,
-  ) {
     logger.verbose('requested updateProfileStatus from ' + instanceName + ' instance');
-    return await this.waMonitor.waInstances[instanceName].updateProfileStatus(
+    return await this.waMonitor.waInstances[instanceName].updateProfileStatus(data.status);
-      data.status,
-    );
   }
 
-  public async updateProfilePicture(
+  public async updateProfilePicture({ instanceName }: InstanceDto, data: ProfilePictureDto) {
-    { instanceName }: InstanceDto,
-    data: ProfilePictureDto,
-  ) {
     logger.verbose('requested updateProfilePicture from ' + instanceName + ' instance');
-    return await this.waMonitor.waInstances[instanceName].updateProfilePicture(
+    return await this.waMonitor.waInstances[instanceName].updateProfilePicture(data.picture);
-      data.picture,
-    );
   }
 
-  public async removeProfilePicture(
+  public async removeProfilePicture({ instanceName }: InstanceDto) {
-    { instanceName }: InstanceDto,
-    data: ProfilePictureDto,
-  ) {
     logger.verbose('requested removeProfilePicture from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].removeProfilePicture();
   }

src/whatsapp/controllers/chatwoot.controller.ts

@@ -1,24 +1,20 @@
 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';
+import { Logger } from '../../config/logger.config';
+import { BadRequestException } from '../../exceptions';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { InstanceDto } from '../dto/instance.dto';
+import { ChatwootService } from '../services/chatwoot.service';
+import { waMonitor } from '../whatsapp.module';
 
 const logger = new Logger('ChatwootController');
 
 export class ChatwootController {
-  constructor(
+  constructor(private readonly chatwootService: ChatwootService, private readonly configService: ConfigService) {}
-    private readonly chatwootService: ChatwootService,
-    private readonly configService: ConfigService,
-  ) {}
 
   public async createChatwoot(instance: InstanceDto, data: ChatwootDto) {
-    logger.verbose(
+    logger.verbose('requested createChatwoot from ' + instance.instanceName + ' instance');
-      'requested createChatwoot from ' + instance.instanceName + ' instance',
-    );
 
     if (data.enabled) {
       if (!isURL(data.url, { require_tld: false })) {
@@ -33,7 +29,7 @@ export class ChatwootController {
         throw new BadRequestException('token is required');
       }
 
-      if (!data.sign_msg) {
+      if (data.sign_msg !== true && data.sign_msg !== false) {
         throw new BadRequestException('sign_msg is required');
       }
     }
@@ -44,6 +40,8 @@ export class ChatwootController {
       data.token = '';
       data.url = '';
       data.sign_msg = false;
+      data.reopen_conversation = false;
+      data.conversation_pending = false;
     }
 
     data.name_inbox = instance.instanceName;
@@ -87,11 +85,15 @@ export class ChatwootController {
   }
 
   public async receiveWebhook(instance: InstanceDto, data: any) {
-    logger.verbose(
+    logger.verbose('requested receiveWebhook from ' + instance.instanceName + ' instance');
-      'requested receiveWebhook from ' + instance.instanceName + ' instance',
-    );
     const chatwootService = new ChatwootService(waMonitor, this.configService);
 
     return chatwootService.receiveWebhook(instance, data);
   }
+
+  public async newInstance(data: any) {
+    const chatwootService = new ChatwootService(waMonitor, this.configService);
+
+    return chatwootService.newInstance(data);
+  }
 }

src/whatsapp/controllers/group.controller.ts

@@ -1,3 +1,4 @@
+import { Logger } from '../../config/logger.config';
 import {
   CreateGroupDto,
   GetParticipant,
@@ -13,7 +14,6 @@ import {
 } from '../dto/group.dto';
 import { InstanceDto } from '../dto/instance.dto';
 import { WAMonitoringService } from '../services/monitor.service';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('ChatController');
 
@@ -26,33 +26,18 @@ export class GroupController {
   }
 
   public async updateGroupPicture(instance: InstanceDto, update: GroupPictureDto) {
-    logger.verbose(
+    logger.verbose('requested updateGroupPicture from ' + instance.instanceName + ' instance');
-      'requested updateGroupPicture from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].updateGroupPicture(update);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].updateGroupPicture(
-      update,
-    );
   }
 
   public async updateGroupSubject(instance: InstanceDto, update: GroupSubjectDto) {
-    logger.verbose(
+    logger.verbose('requested updateGroupSubject from ' + instance.instanceName + ' instance');
-      'requested updateGroupSubject from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].updateGroupSubject(update);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].updateGroupSubject(
-      update,
-    );
   }
 
-  public async updateGroupDescription(
+  public async updateGroupDescription(instance: InstanceDto, update: GroupDescriptionDto) {
-    instance: InstanceDto,
+    logger.verbose('requested updateGroupDescription from ' + instance.instanceName + ' instance');
-    update: GroupDescriptionDto,
+    return await this.waMonitor.waInstances[instance.instanceName].updateGroupDescription(update);
-  ) {
-    logger.verbose(
-      'requested updateGroupDescription from ' + instance.instanceName + ' instance',
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].updateGroupDescription(
-      update,
-    );
   }
 
   public async findGroupInfo(instance: InstanceDto, groupJid: GroupJid) {
@@ -61,12 +46,8 @@ export class GroupController {
   }
 
   public async fetchAllGroups(instance: InstanceDto, getPaticipants: GetParticipant) {
-    logger.verbose(
+    logger.verbose('requested fetchAllGroups from ' + instance.instanceName + ' instance');
-      'requested fetchAllGroups from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].fetchAllGroups(getPaticipants);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].fetchAllGroups(
-      getPaticipants,
-    );
   }
 
   public async inviteCode(instance: InstanceDto, groupJid: GroupJid) {
@@ -85,49 +66,28 @@ export class GroupController {
   }
 
   public async revokeInviteCode(instance: InstanceDto, groupJid: GroupJid) {
-    logger.verbose(
+    logger.verbose('requested revokeInviteCode from ' + instance.instanceName + ' instance');
-      'requested revokeInviteCode from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].revokeInviteCode(groupJid);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].revokeInviteCode(
-      groupJid,
-    );
   }
 
   public async findParticipants(instance: InstanceDto, groupJid: GroupJid) {
-    logger.verbose(
+    logger.verbose('requested findParticipants from ' + instance.instanceName + ' instance');
-      'requested findParticipants from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].findParticipants(groupJid);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].findParticipants(
-      groupJid,
-    );
   }
 
-  public async updateGParticipate(
+  public async updateGParticipate(instance: InstanceDto, update: GroupUpdateParticipantDto) {
-    instance: InstanceDto,
+    logger.verbose('requested updateGParticipate from ' + instance.instanceName + ' instance');
-    update: GroupUpdateParticipantDto,
+    return await this.waMonitor.waInstances[instance.instanceName].updateGParticipant(update);
-  ) {
-    logger.verbose(
-      'requested updateGParticipate from ' + instance.instanceName + ' instance',
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].updateGParticipant(
-      update,
-    );
   }
 
   public async updateGSetting(instance: InstanceDto, update: GroupUpdateSettingDto) {
-    logger.verbose(
+    logger.verbose('requested updateGSetting from ' + instance.instanceName + ' instance');
-      'requested updateGSetting from ' + instance.instanceName + ' instance',
-    );
     return await this.waMonitor.waInstances[instance.instanceName].updateGSetting(update);
   }
 
   public async toggleEphemeral(instance: InstanceDto, update: GroupToggleEphemeralDto) {
-    logger.verbose(
+    logger.verbose('requested toggleEphemeral from ' + instance.instanceName + ' instance');
-      'requested toggleEphemeral from ' + instance.instanceName + ' instance',
+    return await this.waMonitor.waInstances[instance.instanceName].toggleEphemeral(update);
-    );
-    return await this.waMonitor.waInstances[instance.instanceName].toggleEphemeral(
-      update,
-    );
   }
 
   public async leaveGroup(instance: InstanceDto, groupJid: GroupJid) {

src/whatsapp/controllers/instance.controller.ts

@@ -1,18 +1,20 @@
 import { delay } from '@whiskeysockets/baileys';
+import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
-import { Auth, ConfigService, HttpServer } from '../../config/env.config';
+
+import { ConfigService, HttpServer } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { RedisCache } from '../../db/redis.client';
 import { BadRequestException, InternalServerErrorException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
 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 { WAMonitoringService } from '../services/monitor.service';
+import { SettingsService } from '../services/settings.service';
+import { WebhookService } from '../services/webhook.service';
+import { WAStartupService } from '../services/whatsapp.service';
 import { wa } from '../types/wa.types';
-import { RedisCache } from '../../db/redis.client';
-import { isURL } from 'class-validator';
 
 export class InstanceController {
   constructor(
@@ -23,6 +25,7 @@ export class InstanceController {
     private readonly authService: AuthService,
     private readonly webhookService: WebhookService,
     private readonly chatwootService: ChatwootService,
+    private readonly settingsService: SettingsService,
     private readonly cache: RedisCache,
   ) {}
 
@@ -34,40 +37,31 @@ export class InstanceController {
     webhook_by_events,
     events,
     qrcode,
+    number,
     token,
     chatwoot_account_id,
     chatwoot_token,
     chatwoot_url,
     chatwoot_sign_msg,
+    chatwoot_reopen_conversation,
+    chatwoot_conversation_pending,
+    reject_call,
+    msg_call,
+    groups_ignore,
+    always_online,
+    read_messages,
+    read_status,
   }: InstanceDto) {
-    this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
+    try {
-
+      this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
-    const mode = this.configService.get<Auth>('AUTHENTICATION').INSTANCE.MODE;
-
-    if (mode === 'container') {
-      this.logger.verbose('container mode');
-
-      if (Object.keys(this.waMonitor.waInstances).length > 0) {
-        throw new BadRequestException([
-          'Instance already created',
-          'Only one instance can be created',
-        ]);
-      }
 
       this.logger.verbose('checking duplicate token');
       await this.authService.checkDuplicateToken(token);
 
       this.logger.verbose('creating instance');
-      const instance = new WAStartupService(
+      const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache);
-        this.configService,
+      instance.instanceName = instanceName;
-        this.eventEmitter,
+
-        this.repository,
-        this.cache,
-      );
-      instance.instanceName = instanceName
-        .toLowerCase()
-        .replace(/[^a-z0-9]/g, '')
-        .replace(' ', '');
       this.logger.verbose('instance: ' + instance.instanceName + ' created');
 
       this.waMonitor.waInstances[instance.instanceName] = instance;
@@ -89,6 +83,7 @@ export class InstanceController {
         if (!isURL(webhook, { require_tld: false })) {
           throw new BadRequestException('Invalid "url" property in webhook');
         }
+
         this.logger.verbose('creating webhook');
         try {
           this.webhookService.create(instance, {
@@ -104,162 +99,31 @@ export class InstanceController {
         }
       }
 
-      if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
+      this.logger.verbose('creating settings');
-        this.logger.verbose('instance created');
+      const settings: wa.LocalSettings = {
-        this.logger.verbose({
+        reject_call: reject_call || false,
-          instance: {
+        msg_call: msg_call || '',
-            instanceName: instance.instanceName,
+        groups_ignore: groups_ignore || false,
-            status: 'created',
+        always_online: always_online || false,
-          },
+        read_messages: read_messages || false,
-          hash,
+        read_status: read_status || false,
-          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: {
-          instanceName: instance.instanceName,
-          status: 'created',
-        },
-        hash,
-        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}`,
-        },
       };
-    } else {
-      this.logger.verbose('server mode');
 
-      this.logger.verbose('checking duplicate token');
+      this.logger.verbose('settings: ' + JSON.stringify(settings));
-      await this.authService.checkDuplicateToken(token);
 
-      this.logger.verbose('creating instance');
+      this.settingsService.create(instance, settings);
-      const instance = new WAStartupService(
-        this.configService,
-        this.eventEmitter,
-        this.repository,
-        this.cache,
-      );
-      instance.instanceName = instanceName
-        .toLowerCase()
-        .replace(/[^a-z0-9]/g, '')
-        .replace(' ', '');
-
-      this.logger.verbose('instance: ' + instance.instanceName + ' created');
-
-      this.waMonitor.waInstances[instance.instanceName] = instance;
-      this.waMonitor.delInstanceTime(instance.instanceName);
-
-      this.logger.verbose('generating hash');
-      const hash = await this.authService.generateHash(
-        {
-          instanceName: instance.instanceName,
-        },
-        token,
-      );
-
-      this.logger.verbose('hash: ' + hash + ' generated');
-
-      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, {
-            enabled: true,
-            url: webhook,
-            events,
-            webhook_by_events,
-          });
-
-          getEvents = (await this.webhookService.find(instance)).events;
-        } catch (error) {
-          this.logger.log(error);
-        }
-      }
 
       if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
         let getQrcode: wa.QrCode;
 
         if (qrcode) {
           this.logger.verbose('creating qrcode');
-          await instance.connectToWhatsapp();
+          await instance.connectToWhatsapp(number);
-          await delay(2000);
+          await delay(5000);
           getQrcode = instance.qrCode;
         }
 
-        this.logger.verbose('instance created');
+        const result = {
-        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',
@@ -268,8 +132,14 @@ export class InstanceController {
           webhook,
           webhook_by_events,
           events: getEvents,
+          settings,
           qrcode: getQrcode,
         };
+
+        this.logger.verbose('instance created');
+        this.logger.verbose(result);
+
+        return result;
       }
 
       if (!chatwoot_account_id) {
@@ -288,6 +158,18 @@ export class InstanceController {
         throw new BadRequestException('Invalid "url" property in chatwoot');
       }
 
+      if (chatwoot_sign_msg !== true && chatwoot_sign_msg !== false) {
+        throw new BadRequestException('sign_msg is required');
+      }
+
+      if (chatwoot_reopen_conversation !== true && chatwoot_reopen_conversation !== false) {
+        throw new BadRequestException('reopen_conversation is required');
+      }
+
+      if (chatwoot_conversation_pending !== true && chatwoot_conversation_pending !== false) {
+        throw new BadRequestException('conversation_pending is required');
+      }
+
       const urlServer = this.configService.get<HttpServer>('SERVER').URL;
 
       try {
@@ -298,6 +180,9 @@ export class InstanceController {
           url: chatwoot_url,
           sign_msg: chatwoot_sign_msg || false,
           name_inbox: instance.instanceName,
+          number,
+          reopen_conversation: chatwoot_reopen_conversation || false,
+          conversation_pending: chatwoot_conversation_pending || false,
         });
 
         this.chatwootService.initInstanceChatwoot(
@@ -305,6 +190,7 @@ export class InstanceController {
           instance.instanceName,
           `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
           qrcode,
+          number,
         );
       } catch (error) {
         this.logger.log(error);
@@ -319,41 +205,58 @@ export class InstanceController {
         webhook,
         webhook_by_events,
         events: getEvents,
+        settings,
         chatwoot: {
           enabled: true,
           account_id: chatwoot_account_id,
           token: chatwoot_token,
           url: chatwoot_url,
           sign_msg: chatwoot_sign_msg || false,
+          reopen_conversation: chatwoot_reopen_conversation || false,
+          conversation_pending: chatwoot_conversation_pending || false,
+          number,
           name_inbox: instance.instanceName,
           webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
         },
       };
+    } catch (error) {
+      this.logger.error(error.message[0]);
+      throw new BadRequestException(error.message[0]);
     }
   }
 
-  public async connectToWhatsapp({ instanceName }: InstanceDto) {
+  public async connectToWhatsapp({ instanceName, number = null }: InstanceDto) {
     try {
-      this.logger.verbose(
+      this.logger.verbose('requested connectToWhatsapp from ' + instanceName + ' instance');
-        'requested connectToWhatsapp from ' + instanceName + ' instance',
-      );
 
       const instance = this.waMonitor.waInstances[instanceName];
       const state = instance?.connectionStatus?.state;
 
       this.logger.verbose('state: ' + state);
 
-      switch (state) {
+      if (state == 'open') {
-        case 'close':
+        return await this.connectionState({ instanceName });
-          this.logger.verbose('connecting');
-          await instance.connectToWhatsapp();
-          await delay(2000);
-          return instance.qrCode;
-        case 'connecting':
-          return instance.qrCode;
-        default:
-          return await this.connectionState({ instanceName });
       }
+
+      if (state == 'connecting') {
+        return instance.qrCode;
+      }
+
+      if (state == 'close') {
+        this.logger.verbose('connecting');
+        await instance.connectToWhatsapp(number);
+
+        await delay(5000);
+        return instance.qrCode;
+      }
+
+      return {
+        instance: {
+          instanceName: instanceName,
+          status: state,
+        },
+        qrcode: instance?.qrCode,
+      };
     } catch (error) {
       this.logger.error(error);
     }
@@ -366,7 +269,7 @@ export class InstanceController {
       this.logger.verbose('logging out instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
 
-      return { error: false, message: 'Instance restarted' };
+      return { status: 'SUCCESS', error: false, response: { message: 'Instance restarted' } };
     } catch (error) {
       this.logger.error(error);
     }
@@ -374,7 +277,12 @@ export class InstanceController {
 
   public async connectionState({ instanceName }: InstanceDto) {
     this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
-    return this.waMonitor.waInstances[instanceName]?.connectionStatus;
+    return {
+      instance: {
+        instanceName: instanceName,
+        state: this.waMonitor.waInstances[instanceName]?.connectionStatus?.state,
+      },
+    };
   }
 
   public async fetchInstances({ instanceName }: InstanceDto) {
@@ -389,24 +297,20 @@ export class InstanceController {
 
   public async logout({ instanceName }: InstanceDto) {
     this.logger.verbose('requested logout from ' + instanceName + ' instance');
-    const stateConn = await this.connectionState({ instanceName });
+    const { instance } = await this.connectionState({ instanceName });
 
-    if (stateConn.state === 'close') {
+    if (instance.state === 'close') {
-      throw new BadRequestException(
+      throw new BadRequestException('The "' + instanceName + '" instance is not connected');
-        'The "' + instanceName + '" instance is not connected',
-      );
     }
 
     try {
       this.logger.verbose('logging out instance: ' + instanceName);
-      await this.waMonitor.waInstances[instanceName]?.client?.logout(
+      await this.waMonitor.waInstances[instanceName]?.client?.logout('Log out instance: ' + instanceName);
-        'Log out instance: ' + instanceName,
-      );
 
       this.logger.verbose('close connection instance: ' + instanceName);
       this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
 
-      return { error: false, message: 'Instance logged out' };
+      return { status: 'SUCCESS', error: false, response: { message: 'Instance logged out' } };
     } catch (error) {
       throw new InternalServerErrorException(error.toString());
     }
@@ -414,26 +318,24 @@ export class InstanceController {
 
   public async deleteInstance({ instanceName }: InstanceDto) {
     this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
-    const stateConn = await this.connectionState({ instanceName });
+    const { instance } = await this.connectionState({ instanceName });
 
-    if (stateConn.state === 'open') {
+    if (instance.state === 'open') {
-      throw new BadRequestException(
+      throw new BadRequestException('The "' + instanceName + '" instance needs to be disconnected');
-        'The "' + instanceName + '" instance needs to be disconnected',
-      );
     }
     try {
-      if (stateConn.state === 'connecting') {
+      if (instance.state === 'connecting') {
         this.logger.verbose('logging out instance: ' + instanceName);
 
         await this.logout({ instanceName });
         delete this.waMonitor.waInstances[instanceName];
-        return { error: false, message: 'Instance deleted' };
+        return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
       } else {
         this.logger.verbose('deleting instance: ' + instanceName);
 
         delete this.waMonitor.waInstances[instanceName];
         this.eventEmitter.emit('remove.instance', instanceName, 'inner');
-        return { error: false, message: 'Instance deleted' };
+        return { status: 'SUCCESS', error: false, response: { message: 'Instance deleted' } };
       }
     } catch (error) {
       throw new BadRequestException(error.toString());

src/whatsapp/controllers/sendMessage.controller.ts

@@ -1,4 +1,6 @@
 import { isBase64, isURL } from 'class-validator';
+
+import { Logger } from '../../config/logger.config';
 import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import {
@@ -16,8 +18,6 @@ import {
 } from '../dto/sendMessage.dto';
 import { WAMonitoringService } from '../services/monitor.service';
 
-import { Logger } from '../../config/logger.config';
-
 const logger = new Logger('MessageRouter');
 
 export class SendMessageController {
@@ -39,12 +39,7 @@ export class SendMessageController {
       throw new BadRequestException('For base64 the file name must be informed.');
     }
 
-    logger.verbose(
+    logger.verbose('isURL: ' + isURL(data?.mediaMessage?.media) + ', isBase64: ' + isBase64(data?.mediaMessage?.media));
-      'isURL: ' +
-        isURL(data?.mediaMessage?.media) +
-        ', isBase64: ' +
-        isBase64(data?.mediaMessage?.media),
-    );
     if (isURL(data?.mediaMessage?.media) || isBase64(data?.mediaMessage?.media)) {
       return await this.waMonitor.waInstances[instanceName].mediaMessage(data);
     }
@@ -55,10 +50,7 @@ export class SendMessageController {
     logger.verbose('requested sendSticker from ' + instanceName + ' instance');
 
     logger.verbose(
-      'isURL: ' +
+      'isURL: ' + isURL(data?.stickerMessage?.image) + ', isBase64: ' + isBase64(data?.stickerMessage?.image),
-        isURL(data?.stickerMessage?.image) +
-        ', isBase64: ' +
-        isBase64(data?.stickerMessage?.image),
     );
     if (isURL(data.stickerMessage.image) || isBase64(data.stickerMessage.image)) {
       return await this.waMonitor.waInstances[instanceName].mediaSticker(data);
@@ -69,12 +61,7 @@ export class SendMessageController {
   public async sendWhatsAppAudio({ instanceName }: InstanceDto, data: SendAudioDto) {
     logger.verbose('requested sendWhatsAppAudio from ' + instanceName + ' instance');
 
-    logger.verbose(
+    logger.verbose('isURL: ' + isURL(data?.audioMessage?.audio) + ', isBase64: ' + isBase64(data?.audioMessage?.audio));
-      'isURL: ' +
-        isURL(data?.audioMessage?.audio) +
-        ', isBase64: ' +
-        isBase64(data?.audioMessage?.audio),
-    );
     if (isURL(data.audioMessage.audio) || isBase64(data.audioMessage.audio)) {
       return await this.waMonitor.waInstances[instanceName].audioWhatsapp(data);
     }
@@ -83,10 +70,7 @@ export class SendMessageController {
 
   public async sendButtons({ instanceName }: InstanceDto, data: SendButtonDto) {
     logger.verbose('requested sendButtons from ' + instanceName + ' instance');
-    if (
+    if (isBase64(data.buttonMessage.mediaMessage?.media) && !data.buttonMessage.mediaMessage?.fileName) {
-      isBase64(data.buttonMessage.mediaMessage?.media) &&
-      !data.buttonMessage.mediaMessage?.fileName
-    ) {
       throw new BadRequestException('For bse64 the file name must be informed.');
     }
     return await this.waMonitor.waInstances[instanceName].buttonMessage(data);
@@ -109,7 +93,7 @@ export class SendMessageController {
 
   public async sendReaction({ instanceName }: InstanceDto, data: SendReactionDto) {
     logger.verbose('requested sendReaction from ' + instanceName + ' instance');
-    if (!data.reactionMessage.reaction.match(/[^\(\)\w\sà-ú"-\+]+/)) {
+    if (!data.reactionMessage.reaction.match(/[^()\w\sà-ú"-+]+/)) {
       throw new BadRequestException('"reaction" must be an emoji');
     }
     return await this.waMonitor.waInstances[instanceName].reactionMessage(data);

src/whatsapp/controllers/settings.controller.ts

@@ -0,0 +1,24 @@
+// import { isURL } from 'class-validator';
+
+import { Logger } from '../../config/logger.config';
+// import { BadRequestException } from '../../exceptions';
+import { InstanceDto } from '../dto/instance.dto';
+import { SettingsDto } from '../dto/settings.dto';
+import { SettingsService } from '../services/settings.service';
+
+const logger = new Logger('SettingsController');
+
+export class SettingsController {
+  constructor(private readonly settingsService: SettingsService) {}
+
+  public async createSettings(instance: InstanceDto, data: SettingsDto) {
+    logger.verbose('requested createSettings from ' + instance.instanceName + ' instance');
+
+    return this.settingsService.create(instance, data);
+  }
+
+  public async findSettings(instance: InstanceDto) {
+    logger.verbose('requested findSettings from ' + instance.instanceName + ' instance');
+    return this.settingsService.find(instance);
+  }
+}

src/whatsapp/controllers/views.controller.ts

@@ -1,4 +1,5 @@
 import { Request, Response } from 'express';
+
 import { Auth, ConfigService } from '../../config/env.config';
 import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
@@ -6,10 +7,7 @@ import { HttpStatus } from '../routers/index.router';
 import { WAMonitoringService } from '../services/monitor.service';
 
 export class ViewsController {
-  constructor(
+  constructor(private readonly waMonit: WAMonitoringService, private readonly configService: ConfigService) {}
-    private readonly waMonit: WAMonitoringService,
-    private readonly configService: ConfigService,
-  ) {}
 
   public async qrcode(request: Request, response: Response) {
     try {

src/whatsapp/controllers/webhook.controller.ts

@@ -1,9 +1,10 @@
 import { isURL } from 'class-validator';
+
+import { Logger } from '../../config/logger.config';
 import { BadRequestException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WebhookService } from '../services/webhook.service';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('WebhookController');
 

src/whatsapp/dto/chat.dto.ts

@@ -1,16 +1,7 @@
-import {
+import { proto, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '@whiskeysockets/baileys';
-  WAPrivacyOnlineValue,
-  WAPrivacyValue,
-  WAReadReceiptsValue,
-  proto,
-} from '@whiskeysockets/baileys';
 
 export class OnWhatsAppDto {
-  constructor(
+  constructor(public readonly jid: string, public readonly exists: boolean, public readonly name?: string) {}
-    public readonly jid: string,
-    public readonly exists: boolean,
-    public readonly name?: string,
-  ) {}
 }
 
 export class getBase64FromMediaMessageDto {
@@ -26,6 +17,19 @@ export class NumberDto {
   number: string;
 }
 
+export class NumberBusiness {
+  wid?: string;
+  jid?: string;
+  exists?: boolean;
+  isBusiness: boolean;
+  name?: string;
+  message?: string;
+  description?: string;
+  email?: string;
+  website?: string[];
+  address?: string;
+}
+
 export class ProfileNameDto {
   name: string;
 }
@@ -46,7 +50,7 @@ class Key {
   remoteJid: string;
 }
 export class ReadMessageDto {
-  readMessages: Key[];
+  read_messages: Key[];
 }
 
 class LastMessage {

src/whatsapp/dto/chatwoot.dto.ts

@@ -5,4 +5,7 @@ export class ChatwootDto {
   url?: string;
   name_inbox?: string;
   sign_msg?: boolean;
+  number?: string;
+  reopen_conversation?: boolean;
+  conversation_pending?: boolean;
 }

src/whatsapp/dto/group.dto.ts

@@ -1,7 +1,8 @@
 export class CreateGroupDto {
   subject: string;
-  description?: string;
   participants: string[];
+  description?: string;
+  promoteParticipants?: boolean;
 }
 
 export class GroupPictureDto {

src/whatsapp/dto/instance.dto.ts

@@ -1,12 +1,21 @@
 export class InstanceDto {
   instanceName: string;
+  qrcode?: boolean;
+  number?: string;
+  token?: string;
   webhook?: string;
   webhook_by_events?: boolean;
   events?: string[];
-  qrcode?: boolean;
+  reject_call?: boolean;
-  token?: string;
+  msg_call?: string;
+  groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
   chatwoot_account_id?: string;
   chatwoot_token?: string;
   chatwoot_url?: string;
   chatwoot_sign_msg?: boolean;
+  chatwoot_reopen_conversation?: boolean;
+  chatwoot_conversation_pending?: boolean;
 }

src/whatsapp/dto/sendMessage.dto.ts

@@ -15,6 +15,8 @@ export class Options {
   presence?: WAPresence;
   quoted?: Quoted;
   mentions?: Mentions;
+  linkPreview?: boolean;
+  encoding?: boolean;
 }
 class OptionsMessage {
   options: Options;

src/whatsapp/dto/settings.dto.ts

@@ -0,0 +1,8 @@
+export class SettingsDto {
+  reject_call?: boolean;
+  msg_call?: string;
+  groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
+}

src/whatsapp/guards/auth.guard.ts

@@ -1,12 +1,13 @@
 import { isJWT } from 'class-validator';
 import { NextFunction, Request, Response } from 'express';
 import jwt from 'jsonwebtoken';
+
+import { name } from '../../../package.json';
 import { Auth, configService } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
-import { name } from '../../../package.json';
+import { ForbiddenException, UnauthorizedException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { JwtPayload } from '../services/auth.service';
-import { ForbiddenException, UnauthorizedException } from '../../exceptions';
 import { repository } from '../whatsapp.module';
 
 const logger = new Logger('GUARD');
@@ -22,15 +23,8 @@ async function jwtGuard(req: Request, res: Response, next: NextFunction) {
     return next();
   }
 
-  if (
+  if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
-    (req.originalUrl.includes('/instance/create') ||
+    throw new ForbiddenException('Missing global api key', 'The global api key must be set');
-      req.originalUrl.includes('/instance/fetchInstances')) &&
-    !key
-  ) {
-    throw new ForbiddenException(
-      'Missing global api key',
-      'The global api key must be set',
-    );
   }
 
   const jwtOpts = configService.get<Auth>('AUTHENTICATION').JWT;
@@ -69,15 +63,8 @@ async function apikey(req: Request, res: Response, next: NextFunction) {
     return next();
   }
 
-  if (
+  if ((req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) && !key) {
-    (req.originalUrl.includes('/instance/create') ||
+    throw new ForbiddenException('Missing global api key', 'The global api key must be set');
-      req.originalUrl.includes('/instance/fetchInstances')) &&
-    !key
-  ) {
-    throw new ForbiddenException(
-      'Missing global api key',
-      'The global api key must be set',
-    );
   }
 
   try {
@@ -86,7 +73,9 @@ async function apikey(req: Request, res: Response, next: NextFunction) {
     if (instanceKey.apikey === key) {
       return next();
     }
-  } catch (error) {}
+  } catch (error) {
+    logger.error(error);
+  }
 
   throw new UnauthorizedException();
 }

src/whatsapp/guards/instance.guard.ts

@@ -1,16 +1,13 @@
 import { NextFunction, Request, Response } from 'express';
 import { existsSync } from 'fs';
 import { join } from 'path';
+
+import { configService, Database, Redis } from '../../config/env.config';
 import { INSTANCE_DIR } from '../../config/path.config';
 import { dbserver } from '../../db/db.connect';
-import {
+import { BadRequestException, ForbiddenException, NotFoundException } from '../../exceptions';
-  BadRequestException,
-  ForbiddenException,
-  NotFoundException,
-} from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { cache, waMonitor } from '../whatsapp.module';
-import { Database, Redis, configService } from '../../config/env.config';
 
 async function getInstance(instanceName: string) {
   const db = configService.get<Database>('DATABASE');
@@ -35,10 +32,7 @@ async function getInstance(instanceName: string) {
 }
 
 export async function instanceExistsGuard(req: Request, _: Response, next: NextFunction) {
-  if (
+  if (req.originalUrl.includes('/instance/create') || req.originalUrl.includes('/instance/fetchInstances')) {
-    req.originalUrl.includes('/instance/create') ||
-    req.originalUrl.includes('/instance/fetchInstances')
-  ) {
     return next();
   }
 
@@ -58,9 +52,7 @@ export async function instanceLoggedGuard(req: Request, _: Response, next: NextF
   if (req.originalUrl.includes('/instance/create')) {
     const instance = req.body as InstanceDto;
     if (await getInstance(instance.instanceName)) {
-      throw new ForbiddenException(
+      throw new ForbiddenException(`This name "${instance.instanceName}" is already in use.`);
-        `This name "${instance.instanceName}" is already in use.`,
-      );
     }
 
     if (waMonitor.waInstances[instance.instanceName]) {

src/whatsapp/models/auth.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 
 export class AuthRaw {

src/whatsapp/models/chat.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 
 export class ChatRaw {

src/whatsapp/models/chatwoot.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 
 export class ChatwootRaw {
@@ -9,6 +10,9 @@ export class ChatwootRaw {
   url?: string;
   name_inbox?: string;
   sign_msg?: boolean;
+  number?: string;
+  reopen_conversation?: boolean;
+  conversation_pending?: boolean;
 }
 
 const chatwootSchema = new Schema<ChatwootRaw>({
@@ -19,11 +23,8 @@ const chatwootSchema = new Schema<ChatwootRaw>({
   url: { type: String, required: true },
   name_inbox: { type: String, required: true },
   sign_msg: { type: Boolean, required: true },
+  number: { type: String, required: true },
 });
 
-export const ChatwootModel = dbserver?.model(
+export const ChatwootModel = dbserver?.model(ChatwootRaw.name, chatwootSchema, 'chatwoot');
-  ChatwootRaw.name,
-  chatwootSchema,
-  'chatwoot',
-);
 export type IChatwootModel = typeof ChatwootModel;

src/whatsapp/models/contact.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 
 export class ContactRaw {

src/whatsapp/models/index.ts

@@ -1,6 +1,7 @@
+export * from './auth.model';
 export * from './chat.model';
+export * from './chatwoot.model';
 export * from './contact.model';
 export * from './message.model';
-export * from './auth.model';
+export * from './settings.model';
 export * from './webhook.model';
-export * from './chatwoot.model';

src/whatsapp/models/message.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 import { wa } from '../types/wa.types';
 
@@ -64,9 +65,5 @@ const messageUpdateSchema = new Schema<MessageUpdateRaw>({
   owner: { type: String, required: true, min: 1 },
 });
 
-export const MessageUpModel = dbserver?.model(
+export const MessageUpModel = dbserver?.model(MessageUpdateRaw.name, messageUpdateSchema, 'messageUpdate');
-  MessageUpdateRaw.name,
-  messageUpdateSchema,
-  'messageUpdate',
-);
 export type IMessageUpModel = typeof MessageUpModel;

src/whatsapp/models/settings.model.ts

@@ -0,0 +1,26 @@
+import { Schema } from 'mongoose';
+
+import { dbserver } from '../../db/db.connect';
+
+export class SettingsRaw {
+  _id?: string;
+  reject_call?: boolean;
+  msg_call?: string;
+  groups_ignore?: boolean;
+  always_online?: boolean;
+  read_messages?: boolean;
+  read_status?: boolean;
+}
+
+const settingsSchema = new Schema<SettingsRaw>({
+  _id: { type: String, _id: true },
+  reject_call: { type: Boolean, required: true },
+  msg_call: { type: String, required: true },
+  groups_ignore: { type: Boolean, required: true },
+  always_online: { type: Boolean, required: true },
+  read_messages: { type: Boolean, required: true },
+  read_status: { type: Boolean, required: true },
+});
+
+export const SettingsModel = dbserver?.model(SettingsRaw.name, settingsSchema, 'settings');
+export type ISettingsModel = typeof SettingsModel;

src/whatsapp/models/webhook.model.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'mongoose';
+
 import { dbserver } from '../../db/db.connect';
 
 export class WebhookRaw {

src/whatsapp/repository/auth.repository.ts

@@ -1,16 +1,14 @@
-import { join } from 'path';
-import { Auth, ConfigService } from '../../config/env.config';
-import { IInsert, Repository } from '../abstract/abstract.repository';
-import { IAuthModel, AuthRaw } from '../models';
 import { readFileSync } from 'fs';
-import { AUTH_DIR } from '../../config/path.config';
+import { join } from 'path';
+
+import { Auth, ConfigService } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { AUTH_DIR } from '../../config/path.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { AuthRaw, IAuthModel } from '../models';
 
 export class AuthRepository extends Repository {
-  constructor(
+  constructor(private readonly authModel: IAuthModel, readonly configService: ConfigService) {
-    private readonly authModel: IAuthModel,
-    readonly configService: ConfigService,
-  ) {
     super(configService);
     this.auth = configService.get<Auth>('AUTHENTICATION');
   }
@@ -23,11 +21,7 @@ export class AuthRepository extends Repository {
       this.logger.verbose('creating auth');
       if (this.dbSettings.ENABLED) {
         this.logger.verbose('saving auth to db');
-        const insert = await this.authModel.replaceOne(
+        const insert = await this.authModel.replaceOne({ _id: instance }, { ...data }, { upsert: true });
-          { _id: instance },
-          { ...data },
-          { upsert: true },
-        );
 
         this.logger.verbose('auth saved to db: ' + insert.modifiedCount + ' auth');
         return { insertCount: insert.modifiedCount };
@@ -40,9 +34,7 @@ export class AuthRepository extends Repository {
         fileName: instance,
         data,
       });
-      this.logger.verbose(
+      this.logger.verbose('auth saved to store in path: ' + join(AUTH_DIR, this.auth.TYPE) + '/' + instance);
-        'auth saved to store in path: ' + join(AUTH_DIR, this.auth.TYPE) + '/' + instance,
-      );
 
       this.logger.verbose('auth created');
       return { insertCount: 1 };

src/whatsapp/repository/chat.repository.ts

@@ -1,29 +1,23 @@
-import { join } from 'path';
-import { ConfigService, StoreConf } from '../../config/env.config';
-import { IInsert, Repository } from '../abstract/abstract.repository';
 import { opendirSync, readFileSync, rmSync } from 'fs';
-import { ChatRaw, IChatModel } from '../models';
+import { join } from 'path';
+
+import { ConfigService, StoreConf } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { ChatRaw, IChatModel } from '../models';
 
 export class ChatQuery {
   where: ChatRaw;
 }
 
 export class ChatRepository extends Repository {
-  constructor(
+  constructor(private readonly chatModel: IChatModel, private readonly configService: ConfigService) {
-    private readonly chatModel: IChatModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
   private readonly logger = new Logger('ChatRepository');
 
-  public async insert(
+  public async insert(data: ChatRaw[], instanceName: string, saveDb = false): Promise<IInsert> {
-    data: ChatRaw[],
-    instanceName: string,
-    saveDb = false,
-  ): Promise<IInsert> {
     this.logger.verbose('inserting chats');
     if (data.length === 0) {
       this.logger.verbose('no chats to insert');
@@ -53,10 +47,7 @@ export class ChatRepository extends Repository {
             data: chat,
           });
           this.logger.verbose(
-            'chats saved to store in path: ' +
+            'chats saved to store in path: ' + join(this.storePath, 'chats', instanceName) + '/' + chat.id,
-              join(this.storePath, 'chats', instanceName) +
-              '/' +
-              chat.id,
           );
         });
 
@@ -89,10 +80,9 @@ export class ChatRepository extends Repository {
         if (dirent.isFile()) {
           chats.push(
             JSON.parse(
-              readFileSync(
+              readFileSync(join(this.storePath, 'chats', query.where.owner, dirent.name), {
-                join(this.storePath, 'chats', query.where.owner, dirent.name),
+                encoding: 'utf-8',
-                { encoding: 'utf-8' },
+              }),
-              ),
             ),
           );
         }

src/whatsapp/repository/chatwoot.repository.ts

@@ -1,15 +1,13 @@
-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 { join } from 'path';
+
+import { ConfigService } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { ChatwootRaw, IChatwootModel } from '../models';
 
 export class ChatwootRepository extends Repository {
-  constructor(
+  constructor(private readonly chatwootModel: IChatwootModel, private readonly configService: ConfigService) {
-    private readonly chatwootModel: IChatwootModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
@@ -20,15 +18,9 @@ export class ChatwootRepository extends Repository {
       this.logger.verbose('creating chatwoot');
       if (this.dbSettings.ENABLED) {
         this.logger.verbose('saving chatwoot to db');
-        const insert = await this.chatwootModel.replaceOne(
+        const insert = await this.chatwootModel.replaceOne({ _id: instance }, { ...data }, { upsert: true });
-          { _id: instance },
-          { ...data },
-          { upsert: true },
-        );
 
-        this.logger.verbose(
+        this.logger.verbose('chatwoot saved to db: ' + insert.modifiedCount + ' chatwoot');
-          'chatwoot saved to db: ' + insert.modifiedCount + ' chatwoot',
-        );
         return { insertCount: insert.modifiedCount };
       }
 
@@ -40,12 +32,7 @@ export class ChatwootRepository extends Repository {
         data,
       });
 
-      this.logger.verbose(
+      this.logger.verbose('chatwoot saved to store in path: ' + join(this.storePath, 'chatwoot') + '/' + instance);
-        'chatwoot saved to store in path: ' +
-          join(this.storePath, 'chatwoot') +
-          '/' +
-          instance,
-      );
 
       this.logger.verbose('chatwoot created');
       return { insertCount: 1 };

src/whatsapp/repository/contact.repository.ts

@@ -1,29 +1,23 @@
 import { opendirSync, readFileSync } from 'fs';
 import { join } from 'path';
+
 import { ConfigService, StoreConf } from '../../config/env.config';
-import { ContactRaw, IContactModel } from '../models';
-import { IInsert, Repository } from '../abstract/abstract.repository';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { ContactRaw, IContactModel } from '../models';
 
 export class ContactQuery {
   where: ContactRaw;
 }
 
 export class ContactRepository extends Repository {
-  constructor(
+  constructor(private readonly contactModel: IContactModel, private readonly configService: ConfigService) {
-    private readonly contactModel: IContactModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
   private readonly logger = new Logger('ContactRepository');
 
-  public async insert(
+  public async insert(data: ContactRaw[], instanceName: string, saveDb = false): Promise<IInsert> {
-    data: ContactRaw[],
-    instanceName: string,
-    saveDb = false,
-  ): Promise<IInsert> {
     this.logger.verbose('inserting contacts');
 
     if (data.length === 0) {
@@ -54,10 +48,7 @@ export class ContactRepository extends Repository {
             data: contact,
           });
           this.logger.verbose(
-            'contacts saved to store in path: ' +
+            'contacts saved to store in path: ' + join(this.storePath, 'contacts', instanceName) + '/' + contact.id,
-              join(this.storePath, 'contacts', instanceName) +
-              '/' +
-              contact.id,
           );
         });
 
@@ -74,11 +65,7 @@ export class ContactRepository extends Repository {
     }
   }
 
-  public async update(
+  public async update(data: ContactRaw[], instanceName: string, saveDb = false): Promise<IInsert> {
-    data: ContactRaw[],
-    instanceName: string,
-    saveDb = false,
-  ): Promise<IInsert> {
     try {
       this.logger.verbose('updating contacts');
 
@@ -119,10 +106,7 @@ export class ContactRepository extends Repository {
             data: contact,
           });
           this.logger.verbose(
-            'contacts updated in store in path: ' +
+            'contacts updated in store in path: ' + join(this.storePath, 'contacts', instanceName) + '/' + contact.id,
-              join(this.storePath, 'contacts', instanceName) +
-              '/' +
-              contact.id,
           );
         });
 
@@ -154,15 +138,9 @@ export class ContactRepository extends Repository {
         this.logger.verbose('finding contacts in store by id');
         contacts.push(
           JSON.parse(
-            readFileSync(
+            readFileSync(join(this.storePath, 'contacts', query.where.owner, query.where.id + '.json'), {
-              join(
+              encoding: 'utf-8',
-                this.storePath,
+            }),
-                'contacts',
-                query.where.owner,
-                query.where.id + '.json',
-              ),
-              { encoding: 'utf-8' },
-            ),
           ),
         );
       } else {
@@ -175,10 +153,9 @@ export class ContactRepository extends Repository {
           if (dirent.isFile()) {
             contacts.push(
               JSON.parse(
-                readFileSync(
+                readFileSync(join(this.storePath, 'contacts', query.where.owner, dirent.name), {
-                  join(this.storePath, 'contacts', query.where.owner, dirent.name),
+                  encoding: 'utf-8',
-                  { encoding: 'utf-8' },
+                }),
-                ),
               ),
             );
           }

src/whatsapp/repository/message.repository.ts

@@ -1,9 +1,10 @@
-import { ConfigService, StoreConf } from '../../config/env.config';
-import { join } from 'path';
-import { IMessageModel, MessageRaw } from '../models';
-import { IInsert, Repository } from '../abstract/abstract.repository';
 import { opendirSync, readFileSync } from 'fs';
+import { join } from 'path';
+
+import { ConfigService, StoreConf } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { IMessageModel, MessageRaw } from '../models';
 
 export class MessageQuery {
   where: MessageRaw;
@@ -11,20 +12,13 @@ export class MessageQuery {
 }
 
 export class MessageRepository extends Repository {
-  constructor(
+  constructor(private readonly messageModel: IMessageModel, private readonly configService: ConfigService) {
-    private readonly messageModel: IMessageModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
   private readonly logger = new Logger('MessageRepository');
 
-  public async insert(
+  public async insert(data: MessageRaw[], instanceName: string, saveDb = false): Promise<IInsert> {
-    data: MessageRaw[],
-    instanceName: string,
-    saveDb = false,
-  ): Promise<IInsert> {
     this.logger.verbose('inserting messages');
 
     if (!Array.isArray(data) || data.length === 0) {
@@ -74,10 +68,7 @@ export class MessageRepository extends Repository {
             data: message,
           });
           this.logger.verbose(
-            'messages saved to store in path: ' +
+            'messages saved to store in path: ' + join(this.storePath, 'messages', instanceName) + '/' + message.key.id,
-              join(this.storePath, 'messages', instanceName) +
-              '/' +
-              message.key.id,
           );
         });
 
@@ -119,15 +110,9 @@ export class MessageRepository extends Repository {
         this.logger.verbose('finding messages in store by id');
         messages.push(
           JSON.parse(
-            readFileSync(
+            readFileSync(join(this.storePath, 'messages', query.where.owner, query.where.key.id + '.json'), {
-              join(
+              encoding: 'utf-8',
-                this.storePath,
+            }),
-                'messages',
-                query.where.owner,
-                query.where.key.id + '.json',
-              ),
-              { encoding: 'utf-8' },
-            ),
           ),
         );
       } else {
@@ -140,10 +125,9 @@ export class MessageRepository extends Repository {
           if (dirent.isFile()) {
             messages.push(
               JSON.parse(
-                readFileSync(
+                readFileSync(join(this.storePath, 'messages', query.where.owner, dirent.name), {
-                  join(this.storePath, 'messages', query.where.owner, dirent.name),
+                  encoding: 'utf-8',
-                  { encoding: 'utf-8' },
+                }),
-                ),
               ),
             );
           }

src/whatsapp/repository/messageUp.repository.ts

@@ -1,9 +1,10 @@
-import { ConfigService, StoreConf } from '../../config/env.config';
-import { IMessageUpModel, MessageUpdateRaw } from '../models';
-import { IInsert, Repository } from '../abstract/abstract.repository';
-import { join } from 'path';
 import { opendirSync, readFileSync } from 'fs';
+import { join } from 'path';
+
+import { ConfigService, StoreConf } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { IMessageUpModel, MessageUpdateRaw } from '../models';
 
 export class MessageUpQuery {
   where: MessageUpdateRaw;
@@ -11,20 +12,13 @@ export class MessageUpQuery {
 }
 
 export class MessageUpRepository extends Repository {
-  constructor(
+  constructor(private readonly messageUpModel: IMessageUpModel, private readonly configService: ConfigService) {
-    private readonly messageUpModel: IMessageUpModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
   private readonly logger = new Logger('MessageUpRepository');
 
-  public async insert(
+  public async insert(data: MessageUpdateRaw[], instanceName: string, saveDb?: boolean): Promise<IInsert> {
-    data: MessageUpdateRaw[],
-    instanceName: string,
-    saveDb?: boolean,
-  ): Promise<IInsert> {
     this.logger.verbose('inserting message up');
 
     if (data.length === 0) {
@@ -54,10 +48,7 @@ export class MessageUpRepository extends Repository {
             data: update,
           });
           this.logger.verbose(
-            'message up saved to store in path: ' +
+            'message up saved to store in path: ' + join(this.storePath, 'message-up', instanceName) + '/' + update.id,
-              join(this.storePath, 'message-up', instanceName) +
-              '/' +
-              update.id,
           );
         });
 
@@ -91,42 +82,32 @@ export class MessageUpRepository extends Repository {
 
         messageUpdate.push(
           JSON.parse(
-            readFileSync(
+            readFileSync(join(this.storePath, 'message-up', query.where.owner, query.where.id + '.json'), {
-              join(
+              encoding: 'utf-8',
-                this.storePath,
+            }),
-                'message-up',
-                query.where.owner,
-                query.where.id + '.json',
-              ),
-              { encoding: 'utf-8' },
-            ),
           ),
         );
       } else {
         this.logger.verbose('finding message up in store by owner');
 
-        const openDir = opendirSync(
+        const openDir = opendirSync(join(this.storePath, 'message-up', query.where.owner), {
-          join(this.storePath, 'message-up', query.where.owner),
+          encoding: 'utf-8',
-          { encoding: 'utf-8' },
+        });
-        );
 
         for await (const dirent of openDir) {
           if (dirent.isFile()) {
             messageUpdate.push(
               JSON.parse(
-                readFileSync(
+                readFileSync(join(this.storePath, 'message-up', query.where.owner, dirent.name), {
-                  join(this.storePath, 'message-up', query.where.owner, dirent.name),
+                  encoding: 'utf-8',
-                  { encoding: 'utf-8' },
+                }),
-                ),
               ),
             );
           }
         }
       }
 
-      this.logger.verbose(
+      this.logger.verbose('message up found in store: ' + messageUpdate.length + ' message up');
-        'message up found in store: ' + messageUpdate.length + ' message up',
-      );
       return messageUpdate
         .sort((x, y) => {
           return y.datetime - x.datetime;

src/whatsapp/repository/repository.manager.ts

@@ -1,17 +1,17 @@
-import { MessageRepository } from './message.repository';
-import { ChatRepository } from './chat.repository';
-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 { MongoClient } from 'mongodb';
+import { join } from 'path';
+
+import { Auth, ConfigService, Database } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { AuthRepository } from './auth.repository';
+import { ChatRepository } from './chat.repository';
+import { ChatwootRepository } from './chatwoot.repository';
+import { ContactRepository } from './contact.repository';
+import { MessageRepository } from './message.repository';
+import { MessageUpRepository } from './messageUp.repository';
+import { SettingsRepository } from './settings.repository';
+import { WebhookRepository } from './webhook.repository';
 export class RepositoryBroker {
   constructor(
     public readonly message: MessageRepository,
@@ -20,6 +20,7 @@ export class RepositoryBroker {
     public readonly messageUpdate: MessageUpRepository,
     public readonly webhook: WebhookRepository,
     public readonly chatwoot: ChatwootRepository,
+    public readonly settings: SettingsRepository,
     public readonly auth: AuthRepository,
     private configService: ConfigService,
     dbServer?: MongoClient,
@@ -42,20 +43,16 @@ export class RepositoryBroker {
 
       this.logger.verbose('creating store path: ' + storePath);
       try {
-        const authDir = join(
+        const authDir = join(storePath, 'auth', this.configService.get<Auth>('AUTHENTICATION').TYPE);
-          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 settingsDir = join(storePath, 'settings');
         const tempDir = join(storePath, 'temp');
 
-        // Check if directories exist, create them if not
         if (!fs.existsSync(authDir)) {
           this.logger.verbose('creating auth dir: ' + authDir);
           fs.mkdirSync(authDir, { recursive: true });
@@ -80,6 +77,30 @@ export class RepositoryBroker {
           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(settingsDir)) {
+          this.logger.verbose('creating settings dir: ' + settingsDir);
+          fs.mkdirSync(settingsDir, { recursive: true });
+        }
+        if (!fs.existsSync(tempDir)) {
+          this.logger.verbose('creating temp dir: ' + tempDir);
+          fs.mkdirSync(tempDir, { recursive: true });
+        }
+      } catch (error) {
+        this.logger.error(error);
+      }
+    } else {
+      try {
+        const storePath = join(process.cwd(), 'store');
+
+        this.logger.verbose('creating store path: ' + storePath);
+
+        const tempDir = join(storePath, 'temp');
+        const chatwootDir = join(storePath, 'chatwoot');
+
         if (!fs.existsSync(chatwootDir)) {
           this.logger.verbose('creating chatwoot dir: ' + chatwootDir);
           fs.mkdirSync(chatwootDir, { recursive: true });

src/whatsapp/repository/settings.repository.ts

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

src/whatsapp/repository/webhook.repository.ts

@@ -1,15 +1,13 @@
-import { IInsert, Repository } from '../abstract/abstract.repository';
-import { ConfigService } from '../../config/env.config';
-import { join } from 'path';
 import { readFileSync } from 'fs';
-import { IWebhookModel, WebhookRaw } from '../models';
+import { join } from 'path';
+
+import { ConfigService } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
+import { IInsert, Repository } from '../abstract/abstract.repository';
+import { IWebhookModel, WebhookRaw } from '../models';
 
 export class WebhookRepository extends Repository {
-  constructor(
+  constructor(private readonly webhookModel: IWebhookModel, private readonly configService: ConfigService) {
-    private readonly webhookModel: IWebhookModel,
-    private readonly configService: ConfigService,
-  ) {
     super(configService);
   }
 
@@ -20,11 +18,7 @@ export class WebhookRepository extends Repository {
       this.logger.verbose('creating webhook');
       if (this.dbSettings.ENABLED) {
         this.logger.verbose('saving webhook to db');
-        const insert = await this.webhookModel.replaceOne(
+        const insert = await this.webhookModel.replaceOne({ _id: instance }, { ...data }, { upsert: true });
-          { _id: instance },
-          { ...data },
-          { upsert: true },
-        );
 
         this.logger.verbose('webhook saved to db: ' + insert.modifiedCount + ' webhook');
         return { insertCount: insert.modifiedCount };
@@ -38,12 +32,7 @@ export class WebhookRepository extends Repository {
         data,
       });
 
-      this.logger.verbose(
+      this.logger.verbose('webhook saved to store in path: ' + join(this.storePath, 'webhook') + '/' + instance);
-        'webhook saved to store in path: ' +
-          join(this.storePath, 'webhook') +
-          '/' +
-          instance,
-      );
 
       this.logger.verbose('webhook created');
       return { insertCount: 1 };

src/whatsapp/routers/chat.router.ts

@@ -1,4 +1,6 @@
 import { RequestHandler, Router } from 'express';
+
+import { Logger } from '../../config/logger.config';
 import {
   archiveChatSchema,
   contactValidateSchema,
@@ -8,13 +10,16 @@ import {
   privacySettingsSchema,
   profileNameSchema,
   profilePictureSchema,
+  profileSchema,
   profileStatusSchema,
   readMessageSchema,
   whatsappNumberSchema,
 } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
 import {
   ArchiveChatDto,
   DeleteMessage,
+  getBase64FromMediaMessageDto,
   NumberDto,
   PrivacySettingDto,
   ProfileNameDto,
@@ -22,17 +27,13 @@ import {
   ProfileStatusDto,
   ReadMessageDto,
   WhatsAppNumberDto,
-  getBase64FromMediaMessageDto,
 } from '../dto/chat.dto';
+import { InstanceDto } from '../dto/instance.dto';
 import { ContactQuery } from '../repository/contact.repository';
 import { MessageQuery } from '../repository/message.repository';
-import { chatController } from '../whatsapp.module';
-import { RouterBroker } from '../abstract/abstract.router';
-import { HttpStatus } from './index.router';
 import { MessageUpQuery } from '../repository/messageUp.repository';
-import { proto } from '@whiskeysockets/baileys';
+import { chatController } from '../whatsapp.module';
-import { InstanceDto } from '../dto/instance.dto';
+import { HttpStatus } from './index.router';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('ChatRouter');
 
@@ -91,27 +92,23 @@ export class ChatRouter extends RouterBroker {
 
         return res.status(HttpStatus.CREATED).json(response);
       })
-      .delete(
+      .delete(this.routerPath('deleteMessageForEveryone'), ...guards, async (req, res) => {
-        this.routerPath('deleteMessageForEveryone'),
+        logger.verbose('request received in deleteMessageForEveryone');
-        ...guards,
+        logger.verbose('request body: ');
-        async (req, res) => {
+        logger.verbose(req.body);
-          logger.verbose('request received in deleteMessageForEveryone');
-          logger.verbose('request body: ');
-          logger.verbose(req.body);
 
-          logger.verbose('request query: ');
+        logger.verbose('request query: ');
-          logger.verbose(req.query);
+        logger.verbose(req.query);
 
-          const response = await this.dataValidate<DeleteMessage>({
+        const response = await this.dataValidate<DeleteMessage>({
-            request: req,
+          request: req,
-            schema: deleteMessageSchema,
+          schema: deleteMessageSchema,
-            ClassRef: DeleteMessage,
+          ClassRef: DeleteMessage,
-            execute: (instance, data) => chatController.deleteMessage(instance, data),
+          execute: (instance, data) => chatController.deleteMessage(instance, data),
-          });
+        });
 
-          return res.status(HttpStatus.CREATED).json(response);
+        return res.status(HttpStatus.CREATED).json(response);
-        },
+      })
-      )
       .post(this.routerPath('fetchProfilePictureUrl'), ...guards, async (req, res) => {
         logger.verbose('request received in fetchProfilePictureUrl');
         logger.verbose('request body: ');
@@ -129,6 +126,23 @@ export class ChatRouter extends RouterBroker {
 
         return res.status(HttpStatus.OK).json(response);
       })
+      .post(this.routerPath('fetchProfile'), ...guards, async (req, res) => {
+        logger.verbose('request received in fetchProfile');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+
+        const response = await this.dataValidate<NumberDto>({
+          request: req,
+          schema: profileSchema,
+          ClassRef: NumberDto,
+          execute: (instance, data) => chatController.fetchProfile(instance, data),
+        });
+
+        return res.status(HttpStatus.OK).json(response);
+      })
       .post(this.routerPath('findContacts'), ...guards, async (req, res) => {
         logger.verbose('request received in findContacts');
         logger.verbose('request body: ');
@@ -158,8 +172,7 @@ export class ChatRouter extends RouterBroker {
           request: req,
           schema: null,
           ClassRef: getBase64FromMediaMessageDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => chatController.getBase64FromMediaMessage(instance, data),
-            chatController.getBase64FromMediaMessage(instance, data),
         });
 
         return res.status(HttpStatus.CREATED).json(response);
@@ -245,8 +258,7 @@ export class ChatRouter extends RouterBroker {
           request: req,
           schema: privacySettingsSchema,
           ClassRef: PrivacySettingDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => chatController.updatePrivacySettings(instance, data),
-            chatController.updatePrivacySettings(instance, data),
         });
 
         return res.status(HttpStatus.CREATED).json(response);
@@ -263,8 +275,7 @@ export class ChatRouter extends RouterBroker {
           request: req,
           schema: profilePictureSchema,
           ClassRef: ProfilePictureDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => chatController.fetchBusinessProfile(instance, data),
-            chatController.fetchBusinessProfile(instance, data),
         });
 
         return res.status(HttpStatus.OK).json(response);
@@ -315,8 +326,7 @@ export class ChatRouter extends RouterBroker {
           request: req,
           schema: profilePictureSchema,
           ClassRef: ProfilePictureDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => chatController.updateProfilePicture(instance, data),
-            chatController.updateProfilePicture(instance, data),
         });
 
         return res.status(HttpStatus.OK).json(response);
@@ -333,8 +343,7 @@ export class ChatRouter extends RouterBroker {
           request: req,
           schema: profilePictureSchema,
           ClassRef: ProfilePictureDto,
-          execute: (instance, data) =>
+          execute: (instance) => chatController.removeProfilePicture(instance),
-            chatController.removeProfilePicture(instance, data),
         });
 
         return res.status(HttpStatus.OK).json(response);

src/whatsapp/routers/chatwoot.router.ts

@@ -1,12 +1,13 @@
 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';
+import { chatwootSchema, instanceNameSchema } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { InstanceDto } from '../dto/instance.dto';
+// import { ChatwootService } from '../services/chatwoot.service';
+import { chatwootController } from '../whatsapp.module';
+import { HttpStatus } from './index.router';
 
 const logger = new Logger('ChatwootRouter');
 

src/whatsapp/routers/group.router.ts

@@ -1,34 +1,35 @@
 import { RequestHandler, Router } from 'express';
+
+import { Logger } from '../../config/logger.config';
 import {
   createGroupSchema,
+  getParticipantsSchema,
+  groupInviteSchema,
   groupJidSchema,
-  updateParticipantsSchema,
+  groupSendInviteSchema,
-  updateSettingsSchema,
   toggleEphemeralSchema,
+  updateGroupDescriptionSchema,
   updateGroupPictureSchema,
   updateGroupSubjectSchema,
-  updateGroupDescriptionSchema,
+  updateParticipantsSchema,
-  groupInviteSchema,
+  updateSettingsSchema,
-  groupSendInviteSchema,
-  getParticipantsSchema,
 } from '../../validate/validate.schema';
 import { RouterBroker } from '../abstract/abstract.router';
 import {
   CreateGroupDto,
+  GetParticipant,
+  GroupDescriptionDto,
   GroupInvite,
   GroupJid,
   GroupPictureDto,
+  GroupSendInvite,
   GroupSubjectDto,
-  GroupDescriptionDto,
+  GroupToggleEphemeralDto,
   GroupUpdateParticipantDto,
   GroupUpdateSettingDto,
-  GroupToggleEphemeralDto,
-  GroupSendInvite,
-  GetParticipant,
 } from '../dto/group.dto';
 import { groupController } from '../whatsapp.module';
 import { HttpStatus } from './index.router';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('GroupRouter');
 
@@ -96,8 +97,7 @@ export class GroupRouter extends RouterBroker {
           request: req,
           schema: updateGroupDescriptionSchema,
           ClassRef: GroupDescriptionDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => groupController.updateGroupDescription(instance, data),
-            groupController.updateGroupDescription(instance, data),
         });
 
         res.status(HttpStatus.CREATED).json(response);

src/whatsapp/routers/index.router.ts

@@ -1,15 +1,17 @@
 import { Router } from 'express';
+import fs from 'fs';
+
 import { Auth, configService } from '../../config/env.config';
-import { instanceExistsGuard, instanceLoggedGuard } from '../guards/instance.guard';
 import { authGuard } from '../guards/auth.guard';
+import { instanceExistsGuard, instanceLoggedGuard } from '../guards/instance.guard';
 import { ChatRouter } from './chat.router';
+import { ChatwootRouter } from './chatwoot.router';
 import { GroupRouter } from './group.router';
 import { InstanceRouter } from './instance.router';
 import { MessageRouter } from './sendMessage.router';
+import { SettingsRouter } from './settings.router';
 import { ViewsRouter } from './view.router';
 import { WebhookRouter } from './webhook.router';
-import { ChatwootRouter } from './chatwoot.router';
-import fs from 'fs';
 
 enum HttpStatus {
   OK = 200,
@@ -35,15 +37,12 @@ router
       version: packageJson.version,
     });
   })
-  .use(
+  .use('/instance', new InstanceRouter(configService, ...guards).router, new ViewsRouter(instanceExistsGuard).router)
-    '/instance',
-    new InstanceRouter(configService, ...guards).router,
-    new ViewsRouter(instanceExistsGuard).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('/chatwoot', new ChatwootRouter(...guards).router);
+  .use('/chatwoot', new ChatwootRouter(...guards).router)
+  .use('/settings', new SettingsRouter(...guards).router);
 
-export { router, HttpStatus };
+export { HttpStatus, router };

src/whatsapp/routers/instance.router.ts

@@ -1,13 +1,14 @@
 import { RequestHandler, Router } from 'express';
-import { instanceNameSchema, oldTokenSchema } from '../../validate/validate.schema';
+
-import { InstanceDto } from '../dto/instance.dto';
-import { instanceController } from '../whatsapp.module';
-import { RouterBroker } from '../abstract/abstract.router';
-import { HttpStatus } from './index.router';
-import { OldToken } from '../services/auth.service';
 import { Auth, ConfigService, Database } from '../../config/env.config';
-import { dbserver } from '../../db/db.connect';
 import { Logger } from '../../config/logger.config';
+import { dbserver } from '../../db/db.connect';
+import { instanceNameSchema, oldTokenSchema } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
+import { InstanceDto } from '../dto/instance.dto';
+import { OldToken } from '../services/auth.service';
+import { instanceController } from '../whatsapp.module';
+import { HttpStatus } from './index.router';
 
 const logger = new Logger('InstanceRouter');
 
@@ -162,17 +163,13 @@ export class InstanceRouter extends RouterBroker {
           await dbserver.dropDatabase();
           return res
             .status(HttpStatus.CREATED)
-            .json({ error: false, message: 'Database deleted' });
+            .json({ status: 'SUCCESS', error: false, response: { message: 'database deleted' } });
         } catch (error) {
-          return res
+          return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({ error: true, message: error.message });
-            .status(HttpStatus.INTERNAL_SERVER_ERROR)
-            .json({ error: true, message: error.message });
         }
       }
 
-      return res
+      return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({ error: true, message: 'Database is not enabled' });
-        .status(HttpStatus.INTERNAL_SERVER_ERROR)
-        .json({ error: true, message: 'Database is not enabled' });
     });
   }
 

src/whatsapp/routers/sendMessage.router.ts

@@ -1,4 +1,6 @@
 import { RequestHandler, Router } from 'express';
+
+import { Logger } from '../../config/logger.config';
 import {
   audioMessageSchema,
   buttonMessageSchema,
@@ -12,6 +14,7 @@ import {
   stickerMessageSchema,
   textMessageSchema,
 } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
 import {
   SendAudioDto,
   SendButtonDto,
@@ -26,9 +29,7 @@ import {
   SendTextDto,
 } from '../dto/sendMessage.dto';
 import { sendMessageController } from '../whatsapp.module';
-import { RouterBroker } from '../abstract/abstract.router';
 import { HttpStatus } from './index.router';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('MessageRouter');
 
@@ -79,8 +80,7 @@ export class MessageRouter extends RouterBroker {
           request: req,
           schema: audioMessageSchema,
           ClassRef: SendMediaDto,
-          execute: (instance, data) =>
+          execute: (instance, data) => sendMessageController.sendWhatsAppAudio(instance, data),
-            sendMessageController.sendWhatsAppAudio(instance, data),
         });
 
         return res.status(HttpStatus.CREATED).json(response);

src/whatsapp/routers/settings.router.ts

@@ -0,0 +1,53 @@
+import { RequestHandler, Router } from 'express';
+
+import { Logger } from '../../config/logger.config';
+import { instanceNameSchema, settingsSchema } from '../../validate/validate.schema';
+import { RouterBroker } from '../abstract/abstract.router';
+import { InstanceDto } from '../dto/instance.dto';
+import { SettingsDto } from '../dto/settings.dto';
+// import { SettingsService } from '../services/settings.service';
+import { settingsController } from '../whatsapp.module';
+import { HttpStatus } from './index.router';
+
+const logger = new Logger('SettingsRouter');
+
+export class SettingsRouter extends RouterBroker {
+  constructor(...guards: RequestHandler[]) {
+    super();
+    this.router
+      .post(this.routerPath('set'), ...guards, async (req, res) => {
+        logger.verbose('request received in setSettings');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.dataValidate<SettingsDto>({
+          request: req,
+          schema: settingsSchema,
+          ClassRef: SettingsDto,
+          execute: (instance, data) => settingsController.createSettings(instance, data),
+        });
+
+        res.status(HttpStatus.CREATED).json(response);
+      })
+      .get(this.routerPath('find'), ...guards, async (req, res) => {
+        logger.verbose('request received in findSettings');
+        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) => settingsController.findSettings(instance),
+        });
+
+        res.status(HttpStatus.OK).json(response);
+      });
+  }
+
+  public readonly router = Router();
+}

src/whatsapp/routers/view.router.ts

@@ -1,4 +1,5 @@
 import { RequestHandler, Router } from 'express';
+
 import { RouterBroker } from '../abstract/abstract.router';
 import { viewsController } from '../whatsapp.module';
 

src/whatsapp/routers/webhook.router.ts

@@ -1,11 +1,12 @@
 import { RequestHandler, Router } from 'express';
+
+import { Logger } from '../../config/logger.config';
 import { instanceNameSchema, webhookSchema } from '../../validate/validate.schema';
 import { RouterBroker } from '../abstract/abstract.router';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { webhookController } from '../whatsapp.module';
 import { HttpStatus } from './index.router';
-import { Logger } from '../../config/logger.config';
 
 const logger = new Logger('WebhookRouter');
 

src/whatsapp/services/auth.service.ts

@@ -1,14 +1,15 @@
-import { Auth, ConfigService, Webhook } from '../../config/env.config';
-import { InstanceDto } from '../dto/instance.dto';
-import { name as apiName } from '../../../package.json';
-import { verify, sign } from 'jsonwebtoken';
-import { Logger } from '../../config/logger.config';
-import { v4 } from 'uuid';
-import { isJWT } from 'class-validator';
-import { BadRequestException } from '../../exceptions';
 import axios from 'axios';
-import { WAMonitoringService } from './monitor.service';
+import { isJWT } from 'class-validator';
+import { sign, verify } from 'jsonwebtoken';
+import { v4 } from 'uuid';
+
+import { name as apiName } from '../../../package.json';
+import { Auth, ConfigService, Webhook } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { BadRequestException } from '../../exceptions';
+import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
+import { WAMonitoringService } from './monitor.service';
 
 export type JwtPayload = {
   instanceName: string;
@@ -63,9 +64,7 @@ export class AuthService {
   private async apikey(instance: InstanceDto, token?: string) {
     const apikey = token ? token : v4().toUpperCase();
 
-    this.logger.verbose(
+    this.logger.verbose(token ? 'APIKEY defined: ' + apikey : 'APIKEY created: ' + apikey);
-      token ? 'APIKEY defined: ' + apikey : 'APIKEY created: ' + apikey,
-    );
 
     const auth = await this.repository.auth.create({ apikey }, instance.instanceName);
 
@@ -101,13 +100,9 @@ export class AuthService {
   public async generateHash(instance: InstanceDto, token?: string) {
     const options = this.configService.get<Auth>('AUTHENTICATION');
 
-    this.logger.verbose(
+    this.logger.verbose('generating hash ' + options.TYPE + ' to instance: ' + instance.instanceName);
-      'generating hash ' + options.TYPE + ' to instance: ' + instance.instanceName,
-    );
 
-    return (await this[options.TYPE](instance, token)) as
+    return (await this[options.TYPE](instance, token)) as { jwt: string } | { apikey: string };
-      | { jwt: string }
-      | { apikey: string };
   }
 
   public async refreshToken({ oldToken }: OldToken) {
@@ -150,10 +145,7 @@ export class AuthService {
       try {
         this.logger.verbose('checking webhook');
         const webhook = await this.repository.webhook.find(decode.instanceName);
-        if (
+        if (webhook?.enabled && this.configService.get<Webhook>('WEBHOOK').EVENTS.NEW_JWT_TOKEN) {
-          webhook?.enabled &&
-          this.configService.get<Webhook>('WEBHOOK').EVENTS.NEW_JWT_TOKEN
-        ) {
           this.logger.verbose('sending webhook');
 
           const httpService = axios.create({ baseURL: webhook.url });

src/whatsapp/services/chatwoot.service.ts

@@ -1,18 +1,17 @@
-import { InstanceDto } from '../dto/instance.dto';
-import path from 'path';
-import { ChatwootDto } from '../dto/chatwoot.dto';
-import { WAMonitoringService } from './monitor.service';
-import { Logger } from '../../config/logger.config';
 import ChatwootClient from '@figuro/chatwoot-sdk';
-import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import axios from 'axios';
 import FormData from 'form-data';
-import { SendTextDto } from '../dto/sendMessage.dto';
+import { createReadStream, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import mimeTypes from 'mime-types';
-import { SendAudioDto } from '../dto/sendMessage.dto';
+import path from 'path';
-import { SendMediaDto } from '../dto/sendMessage.dto';
+
-import { ROOT_DIR } from '../../config/path.config';
 import { ConfigService, HttpServer } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { ROOT_DIR } from '../../config/path.config';
+import { ChatwootDto } from '../dto/chatwoot.dto';
+import { InstanceDto } from '../dto/instance.dto';
+import { SendAudioDto, SendMediaDto, SendTextDto } from '../dto/sendMessage.dto';
+import { WAMonitoringService } from './monitor.service';
 
 export class ChatwootService {
   private messageCacheFile: string;
@@ -22,10 +21,7 @@ export class ChatwootService {
 
   private provider: any;
 
-  constructor(
+  constructor(private readonly waMonitor: WAMonitoringService, private readonly configService: ConfigService) {
-    private readonly waMonitor: WAMonitoringService,
-    private readonly configService: ConfigService,
-  ) {
     this.messageCache = new Set();
   }
 
@@ -56,9 +52,7 @@ export class ChatwootService {
   private async getProvider(instance: InstanceDto) {
     this.logger.verbose('get provider to instance: ' + instance.instanceName);
     try {
-      const provider = await this.waMonitor.waInstances[
+      const provider = await this.waMonitor.waInstances[instance.instanceName].findChatwoot();
-        instance.instanceName
-      ].findChatwoot();
 
       if (!provider) {
         this.logger.warn('provider not found');
@@ -154,6 +148,7 @@ export class ChatwootService {
     inboxName: string,
     webhookUrl: string,
     qrcode: boolean,
+    number: string,
   ) {
     this.logger.verbose('init instance chatwoot: ' + instance.instanceName);
 
@@ -170,9 +165,7 @@ export class ChatwootService {
     });
 
     this.logger.verbose('check duplicate inbox');
-    const checkDuplicate = findInbox.payload
+    const checkDuplicate = findInbox.payload.map((inbox) => inbox.name).includes(inboxName);
-      .map((inbox) => inbox.name)
-      .includes(inboxName);
 
     let inboxId: number;
 
@@ -212,13 +205,7 @@ export class ChatwootService {
     this.logger.verbose('find contact in chatwoot and create if not exists');
     const contact =
       (await this.findContact(instance, '123456')) ||
-      ((await this.createContact(
+      ((await this.createContact(instance, '123456', inboxId, false, 'EvolutionAPI')) as any);
-        instance,
-        '123456',
-        inboxId,
-        false,
-        'EvolutionAPI',
-      )) as any);
 
     if (!contact) {
       this.logger.warn('contact not found');
@@ -229,12 +216,18 @@ export class ChatwootService {
 
     if (qrcode) {
       this.logger.verbose('create conversation in chatwoot');
+      const data = {
+        contact_id: contactId.toString(),
+        inbox_id: inboxId.toString(),
+      };
+
+      if (this.provider.conversation_pending) {
+        data['status'] = 'pending';
+      }
+
       const conversation = await client.conversations.create({
         accountId: this.provider.account_id,
-        data: {
+        data,
-          contact_id: contactId.toString(),
-          inbox_id: inboxId.toString(),
-        },
       });
 
       if (!conversation) {
@@ -243,11 +236,18 @@ export class ChatwootService {
       }
 
       this.logger.verbose('create message for init instance in chatwoot');
+
+      let contentMsg = '/init';
+
+      if (number) {
+        contentMsg = `/init:${number}`;
+      }
+
       const message = await client.messages.create({
         accountId: this.provider.account_id,
         conversationId: conversation.id,
         data: {
-          content: '/init',
+          content: contentMsg,
           message_type: 'outgoing',
         },
       });
@@ -410,28 +410,25 @@ export class ChatwootService {
 
       if (isGroup) {
         this.logger.verbose('get group name');
-        const group = await this.waMonitor.waInstances[
+        const group = await this.waMonitor.waInstances[instance.instanceName].client.groupMetadata(chatId);
-          instance.instanceName
-        ].client.groupMetadata(chatId);
 
         nameContact = `${group.subject} (GROUP)`;
 
         this.logger.verbose('find or create participant in chatwoot');
 
-        const picture_url = await this.waMonitor.waInstances[
+        const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(
-          instance.instanceName
-        ].profilePicture(body.key.participant.split('@')[0]);
-
-        const findParticipant = await this.findContact(
-          instance,
           body.key.participant.split('@')[0],
         );
 
+        const findParticipant = await this.findContact(instance, body.key.participant.split('@')[0]);
+
         if (findParticipant) {
-          await this.updateContact(instance, findParticipant.id, {
+          if (!findParticipant.name || findParticipant.name === chatId) {
-            name: body.pushName,
+            await this.updateContact(instance, findParticipant.id, {
-            avatar_url: picture_url.profilePictureUrl || null,
+              name: body.pushName,
-          });
+              avatar_url: picture_url.profilePictureUrl || null,
+            });
+          }
         } else {
           await this.createContact(
             instance,
@@ -446,21 +443,34 @@ export class ChatwootService {
 
       this.logger.verbose('find or create contact in chatwoot');
 
-      const picture_url = await this.waMonitor.waInstances[
+      const picture_url = await this.waMonitor.waInstances[instance.instanceName].profilePicture(chatId);
-        instance.instanceName
-      ].profilePicture(chatId);
 
       const findContact = await this.findContact(instance, chatId);
 
       let contact: any;
       if (body.key.fromMe) {
-        contact = findContact;
+        if (findContact) {
+          contact = findContact;
+        } else {
+          contact = await this.createContact(
+            instance,
+            chatId,
+            filterInbox.id,
+            isGroup,
+            nameContact,
+            picture_url.profilePictureUrl || null,
+          );
+        }
       } else {
         if (findContact) {
-          contact = await this.updateContact(instance, findContact.id, {
+          if (!findContact.name || findContact.name === chatId) {
-            name: nameContact,
+            contact = await this.updateContact(instance, findContact.id, {
-            avatar_url: picture_url.profilePictureUrl || null,
+              name: nameContact,
-          });
+              avatar_url: picture_url.profilePictureUrl || null,
+            });
+          } else {
+            contact = findContact;
+          }
         } else {
           contact = await this.createContact(
             instance,
@@ -478,8 +488,7 @@ export class ChatwootService {
         return null;
       }
 
-      const contactId =
+      const contactId = contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
-        contact?.payload?.id || contact?.payload?.contact?.id || contact?.id;
 
       if (!body.key.fromMe && contact.name === chatId && nameContact !== chatId) {
         this.logger.verbose('update contact name in chatwoot');
@@ -495,11 +504,26 @@ export class ChatwootService {
       })) as any;
 
       if (contactConversations) {
+        let conversation: any;
+        if (this.provider.reopen_conversation) {
+          conversation = contactConversations.payload.find((conversation) => conversation.inbox_id == filterInbox.id);
+
+          if (this.provider.conversation_pending) {
+            await client.conversations.toggleStatus({
+              accountId: this.provider.account_id,
+              conversationId: conversation.id,
+              data: {
+                status: 'pending',
+              },
+            });
+          }
+        } else {
+          conversation = contactConversations.payload.find(
+            (conversation) => conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
+          );
+        }
         this.logger.verbose('return conversation if exists');
-        const conversation = contactConversations.payload.find(
+
-          (conversation) =>
-            conversation.status !== 'resolved' && conversation.inbox_id == filterInbox.id,
-        );
         if (conversation) {
           this.logger.verbose('conversation found');
           return conversation.id;
@@ -507,12 +531,18 @@ export class ChatwootService {
       }
 
       this.logger.verbose('create conversation in chatwoot');
+      const data = {
+        contact_id: contactId.toString(),
+        inbox_id: filterInbox.id.toString(),
+      };
+
+      if (this.provider.conversation_pending) {
+        data['status'] = 'pending';
+      }
+
       const conversation = await client.conversations.create({
         accountId: this.provider.account_id,
-        data: {
+        data,
-          contact_id: `${contactId}`,
-          inbox_id: `${filterInbox.id}`,
-        },
       });
 
       if (!conversation) {
@@ -548,9 +578,7 @@ export class ChatwootService {
     }
 
     this.logger.verbose('find inbox by name');
-    const findByName = inbox.payload.find(
+    const findByName = inbox.payload.find((inbox) => inbox.name === instance.instanceName);
-      (inbox) => inbox.name === instance.instanceName,
-    );
 
     if (!findByName) {
       this.logger.warn('inbox not found');
@@ -652,8 +680,7 @@ export class ChatwootService {
 
     this.logger.verbose('find conversation by contact id');
     const conversation = findConversation.data.payload.find(
-      (conversation) =>
+      (conversation) => conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
-        conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
     );
 
     if (!conversation) {
@@ -773,8 +800,7 @@ export class ChatwootService {
 
     this.logger.verbose('find conversation by contact id');
     const conversation = findConversation.data.payload.find(
-      (conversation) =>
+      (conversation) => conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
-        conversation?.meta?.sender?.id === contact.id && conversation.status === 'open',
     );
 
     if (!conversation) {
@@ -824,12 +850,7 @@ export class ChatwootService {
     }
   }
 
-  public async sendAttachment(
+  public async sendAttachment(waInstance: any, number: string, media: any, caption?: string) {
-    waInstance: any,
-    number: string,
-    media: any,
-    caption?: string,
-  ) {
     this.logger.verbose('send attachment to instance: ' + waInstance.instanceName);
 
     try {
@@ -910,9 +931,7 @@ export class ChatwootService {
 
   public async receiveWebhook(instance: InstanceDto, body: any) {
     try {
-      this.logger.verbose(
+      this.logger.verbose('receive webhook to chatwoot instance: ' + instance.instanceName);
-        'receive webhook to chatwoot instance: ' + instance.instanceName,
-      );
       const client = await this.clientCw(instance);
 
       if (!client) {
@@ -921,12 +940,11 @@ export class ChatwootService {
       }
 
       this.logger.verbose('check if is bot');
-      if (!body?.conversation || body.private) return { message: 'bot' };
+      if (!body?.conversation || body.private || body.event === 'message_updated') return { message: 'bot' };
 
       this.logger.verbose('check if is group');
       const chatId =
-        body.conversation.meta.sender?.phone_number?.replace('+', '') ||
+        body.conversation.meta.sender?.phone_number?.replace('+', '') || body.conversation.meta.sender?.identifier;
-        body.conversation.meta.sender?.identifier;
       const messageReceived = body.content;
       const senderName = body?.sender?.name;
       const waInstance = this.waMonitor.waInstances[instance.instanceName];
@@ -936,20 +954,17 @@ export class ChatwootService {
 
         const command = messageReceived.replace('/', '');
 
-        if (command === 'init' || command === 'iniciar') {
+        if (command.includes('init') || command.includes('iniciar')) {
           this.logger.verbose('command init found');
           const state = waInstance?.connectionStatus?.state;
 
           if (state !== 'open') {
             this.logger.verbose('connect to whatsapp');
-            await waInstance.connectToWhatsapp();
+            const number = command.split(':')[1];
+            await waInstance.connectToWhatsapp(number);
           } else {
             this.logger.verbose('whatsapp already connected');
-            await this.createBotMessage(
+            await this.createBotMessage(instance, `🚨 ${body.inbox.name} instance is connected.`, 'incoming');
-              instance,
-              `🚨 ${body.inbox.name} instance is connected.`,
-              'incoming',
-            );
           }
         }
 
@@ -960,20 +975,12 @@ export class ChatwootService {
 
           if (!state) {
             this.logger.verbose('state not found');
-            await this.createBotMessage(
+            await this.createBotMessage(instance, `⚠️ ${body.inbox.name} instance not found.`, 'incoming');
-              instance,
-              `⚠️ ${body.inbox.name} instance not found.`,
-              'incoming',
-            );
           }
 
           if (state) {
             this.logger.verbose('state: ' + state + ' found');
-            await this.createBotMessage(
+            await this.createBotMessage(instance, `⚠️ ${body.inbox.name} instance status: *${state}*`, 'incoming');
-              instance,
-              `⚠️ ${body.inbox.name} instance status: *${state}*`,
-              'incoming',
-            );
           }
         }
 
@@ -990,7 +997,7 @@ export class ChatwootService {
           await waInstance?.client?.ws?.close();
         }
 
-        if (command.includes('#inbox_whatsapp')) {
+        if (command.includes('new_instance')) {
           const urlServer = this.configService.get<HttpServer>('SERVER').URL;
           const apiKey = this.configService.get('AUTHENTICATION').API_KEY.KEY;
 
@@ -1001,8 +1008,14 @@ export class ChatwootService {
             chatwoot_token: this.provider.token,
             chatwoot_url: this.provider.url,
             chatwoot_sign_msg: this.provider.sign_msg,
+            chatwoot_reopen_conversation: this.provider.reopen_conversation,
+            chatwoot_conversation_pending: this.provider.conversation_pending,
           };
 
+          if (command.split(':')[2]) {
+            data['number'] = command.split(':')[2];
+          }
+
           const config = {
             method: 'post',
             maxBodyLength: Infinity,
@@ -1018,19 +1031,10 @@ export class ChatwootService {
         }
       }
 
-      if (
+      if (body.message_type === 'outgoing' && body?.conversation?.messages?.length && chatId !== '123456') {
-        body.message_type === 'outgoing' &&
-        body?.conversation?.messages?.length &&
-        chatId !== '123456'
-      ) {
         this.logger.verbose('check if is group');
 
-        this.messageCacheFile = path.join(
+        this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
-          ROOT_DIR,
-          'store',
-          'chatwoot',
-          `${instance.instanceName}_cache.txt`,
-        );
         this.logger.verbose('cache file path: ' + this.messageCacheFile);
 
         this.messageCache = this.loadMessageCache();
@@ -1051,9 +1055,7 @@ export class ChatwootService {
         if (senderName === null || senderName === undefined) {
           formatText = messageReceived;
         } else {
-          formatText = this.provider.sign_msg
+          formatText = this.provider.sign_msg ? `*${senderName}:*\n\n${messageReceived}` : messageReceived;
-            ? `*${senderName}:*\n\n${messageReceived}`
-            : messageReceived;
         }
 
         for (const message of body.conversation.messages) {
@@ -1067,12 +1069,7 @@ export class ChatwootService {
                 formatText = null;
               }
 
-              await this.sendAttachment(
+              await this.sendAttachment(waInstance, chatId, attachment.data_url, formatText);
-                waInstance,
-                chatId,
-                attachment.data_url,
-                formatText,
-              );
             }
           } else {
             this.logger.verbose('message is text');
@@ -1094,17 +1091,13 @@ export class ChatwootService {
         }
       }
 
-      if (
+      if (body.message_type === 'template' && body.event === 'message_created') {
-        body.message_type === 'template' &&
+        this.logger.verbose('check if is template');
-        body.content_type === 'input_csat' &&
-        body.event === 'message_created'
-      ) {
-        this.logger.verbose('check if is csat');
 
         const data: SendTextDto = {
           number: chatId,
           textMessage: {
-            text: body.content,
+            text: body.content.replace(/\\\r\n|\\\n|\n/g, '\n'),
           },
           options: {
             delay: 1200,
@@ -1153,13 +1146,14 @@ export class ChatwootService {
       videoMessage: msg.videoMessage?.caption,
       extendedTextMessage: msg.extendedTextMessage?.text,
       messageContextInfo: msg.messageContextInfo?.stanzaId,
-      stickerMessage: msg.stickerMessage?.fileSha256.toString('base64'),
+      stickerMessage: undefined,
       documentMessage: msg.documentMessage?.caption,
-      documentWithCaptionMessage:
+      documentWithCaptionMessage: msg.documentWithCaptionMessage?.message?.documentMessage?.caption,
-        msg.documentWithCaptionMessage?.message?.documentMessage?.caption,
       audioMessage: msg.audioMessage?.caption,
       contactMessage: msg.contactMessage?.vcard,
       contactsArrayMessage: msg.contactsArrayMessage,
+      locationMessage: msg.locationMessage,
+      liveLocationMessage: msg.liveLocationMessage,
     };
 
     this.logger.verbose('type message: ' + types);
@@ -1173,6 +1167,21 @@ export class ChatwootService {
 
     const result = typeKey ? types[typeKey] : undefined;
 
+    if (typeKey === 'locationMessage' || typeKey === 'liveLocationMessage') {
+      const latitude = result.degreesLatitude;
+      const longitude = result.degreesLongitude;
+
+      const formattedLocation = `**Location:**
+        **latitude:** ${latitude}
+        **longitude:** ${longitude}
+        https://www.google.com/maps/search/?api=1&query=${latitude},${longitude}
+        `;
+
+      this.logger.verbose('message content: ' + formattedLocation);
+
+      return formattedLocation;
+    }
+
     if (typeKey === 'contactMessage') {
       const vCardData = result.split('\n');
       const contactInfo = {};
@@ -1276,6 +1285,16 @@ export class ChatwootService {
           return;
         }
 
+        this.logger.verbose('get conversation message');
+        const bodyMessage = await this.getConversationMessage(body.message);
+
+        const isMedia = this.isMediaMessage(body.message);
+
+        if (!bodyMessage && !isMedia) {
+          this.logger.warn('no body message found');
+          return;
+        }
+
         this.logger.verbose('get conversation in chatwoot');
         const getConversion = await this.createConversation(instance, body);
 
@@ -1288,18 +1307,8 @@ export class ChatwootService {
 
         this.logger.verbose('message type: ' + messageType);
 
-        const isMedia = this.isMediaMessage(body.message);
-
         this.logger.verbose('is media: ' + isMedia);
 
-        this.logger.verbose('get conversation message');
-        const bodyMessage = await this.getConversationMessage(body.message);
-
-        if (!bodyMessage && !isMedia) {
-          this.logger.warn('no body message found');
-          return;
-        }
-
         this.logger.verbose('check if is media');
         if (isMedia) {
           this.logger.verbose('message is media');
@@ -1340,24 +1349,14 @@ export class ChatwootService {
             }
 
             this.logger.verbose('send data to chatwoot');
-            const send = await this.sendData(
+            const send = await this.sendData(getConversion, fileName, messageType, content);
-              getConversion,
-              fileName,
-              messageType,
-              content,
-            );
 
             if (!send) {
               this.logger.warn('message not sent');
               return;
             }
 
-            this.messageCacheFile = path.join(
+            this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
-              ROOT_DIR,
-              'store',
-              'chatwoot',
-              `${instance.instanceName}_cache.txt`,
-            );
 
             this.messageCache = this.loadMessageCache();
 
@@ -1371,24 +1370,14 @@ export class ChatwootService {
             this.logger.verbose('message is not group');
 
             this.logger.verbose('send data to chatwoot');
-            const send = await this.sendData(
+            const send = await this.sendData(getConversion, fileName, messageType, bodyMessage);
-              getConversion,
-              fileName,
-              messageType,
-              bodyMessage,
-            );
 
             if (!send) {
               this.logger.warn('message not sent');
               return;
             }
 
-            this.messageCacheFile = path.join(
+            this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
-              ROOT_DIR,
-              'store',
-              'chatwoot',
-              `${instance.instanceName}_cache.txt`,
-            );
 
             this.messageCache = this.loadMessageCache();
 
@@ -1417,24 +1406,14 @@ export class ChatwootService {
           }
 
           this.logger.verbose('send data to chatwoot');
-          const send = await this.createMessage(
+          const send = await this.createMessage(instance, getConversion, content, messageType);
-            instance,
-            getConversion,
-            content,
-            messageType,
-          );
 
           if (!send) {
             this.logger.warn('message not sent');
             return;
           }
 
-          this.messageCacheFile = path.join(
+          this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
-            ROOT_DIR,
-            'store',
-            'chatwoot',
-            `${instance.instanceName}_cache.txt`,
-          );
 
           this.messageCache = this.loadMessageCache();
 
@@ -1448,24 +1427,14 @@ export class ChatwootService {
           this.logger.verbose('message is not group');
 
           this.logger.verbose('send data to chatwoot');
-          const send = await this.createMessage(
+          const send = await this.createMessage(instance, getConversion, bodyMessage, messageType);
-            instance,
-            getConversion,
-            bodyMessage,
-            messageType,
-          );
 
           if (!send) {
             this.logger.warn('message not sent');
             return;
           }
 
-          this.messageCacheFile = path.join(
+          this.messageCacheFile = path.join(ROOT_DIR, 'store', 'chatwoot', `${instance.instanceName}_cache.txt`);
-            ROOT_DIR,
-            'store',
-            'chatwoot',
-            `${instance.instanceName}_cache.txt`,
-          );
 
           this.messageCache = this.loadMessageCache();
 
@@ -1515,16 +1484,9 @@ export class ChatwootService {
           return await this.createBotMessage(instance, erroQRcode, 'incoming');
         } else {
           this.logger.verbose('qrcode success');
-          const fileData = Buffer.from(
+          const fileData = Buffer.from(body?.qrcode.base64.replace('data:image/png;base64,', ''), 'base64');
-            body?.qrcode.base64.replace('data:image/png;base64,', ''),
-            'base64',
-          );
 
-          const fileName = `${path.join(
+          const fileName = `${path.join(waInstance?.storePath, 'temp', `${`${instance}.png`}`)}`;
-            waInstance?.storePath,
-            'temp',
-            `${`${instance}.png`}`,
-          )}`;
 
           this.logger.verbose('temp file name: ' + fileName);
 
@@ -1532,14 +1494,18 @@ export class ChatwootService {
           writeFileSync(fileName, fileData, 'utf8');
 
           this.logger.verbose('send qrcode to chatwoot');
-          await this.createBotQr(
+          await this.createBotQr(instance, 'QRCode successfully generated!', 'incoming', fileName);
-            instance,
-            'QRCode successfully generated!',
-            'incoming',
-            fileName,
-          );
 
-          const msgQrCode = `⚡️ QRCode successfully generated!\n\nScan this QR code within the next 40 seconds:`;
+          let msgQrCode = `⚡️ QRCode successfully generated!\n\nScan this QR code within the next 40 seconds.`;
+
+          if (body?.qrcode?.pairingCode) {
+            msgQrCode =
+              msgQrCode +
+              `\n\n*Pairing Code:* ${body.qrcode.pairingCode.substring(0, 4)}-${body.qrcode.pairingCode.substring(
+                4,
+                8,
+              )}`;
+          }
 
           this.logger.verbose('send message to chatwoot');
           await this.createBotMessage(instance, msgQrCode, 'incoming');
@@ -1549,4 +1515,50 @@ export class ChatwootService {
       this.logger.error(error);
     }
   }
+
+  public async newInstance(data: any) {
+    try {
+      const instanceName = data.instanceName;
+      const qrcode = true;
+      const number = data.number;
+      const accountId = data.accountId;
+      const chatwootToken = data.token;
+      const chatwootUrl = data.url;
+      const signMsg = true;
+      const urlServer = this.configService.get<HttpServer>('SERVER').URL;
+      const apiKey = this.configService.get('AUTHENTICATION').API_KEY.KEY;
+
+      const requestData = {
+        instanceName,
+        qrcode,
+        chatwoot_account_id: accountId,
+        chatwoot_token: chatwootToken,
+        chatwoot_url: chatwootUrl,
+        chatwoot_sign_msg: signMsg,
+      };
+
+      if (number) {
+        requestData['number'] = number;
+      }
+
+      // eslint-disable-next-line
+      const config = {
+        method: 'post',
+        maxBodyLength: Infinity,
+        url: `${urlServer}/instance/create`,
+        headers: {
+          'Content-Type': 'application/json',
+          apikey: apiKey,
+        },
+        data: requestData,
+      };
+
+      // await axios.request(config);
+
+      return true;
+    } catch (error) {
+      this.logger.error(error);
+      return null;
+    }
+  }
 }

src/whatsapp/services/monitor.service.ts

@@ -1,23 +1,26 @@
-import { opendirSync, readdirSync, rmSync } from 'fs';
-import { WAStartupService } from './whatsapp.service';
-import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
-import EventEmitter2 from 'eventemitter2';
-import { join } from 'path';
-import { Logger } from '../../config/logger.config';
-import {
-  Auth,
-  ConfigService,
-  Database,
-  DelInstance,
-  HttpServer,
-  Redis,
-} from '../../config/env.config';
-import { RepositoryBroker } from '../repository/repository.manager';
-import { NotFoundException } from '../../exceptions';
-import { Db } from 'mongodb';
-import { initInstance } from '../whatsapp.module';
-import { RedisCache } from '../../db/redis.client';
 import { execSync } from 'child_process';
+import EventEmitter2 from 'eventemitter2';
+import { opendirSync, readdirSync, rmSync } from 'fs';
+import { Db } from 'mongodb';
+import { join } from 'path';
+
+import { Auth, ConfigService, Database, DelInstance, HttpServer, Redis } from '../../config/env.config';
+import { Logger } from '../../config/logger.config';
+import { INSTANCE_DIR, STORE_DIR } from '../../config/path.config';
+import { dbserver } from '../../db/db.connect';
+import { RedisCache } from '../../db/redis.client';
+import { NotFoundException } from '../../exceptions';
+import {
+  AuthModel,
+  ChatwootModel,
+  ContactModel,
+  MessageModel,
+  MessageUpModel,
+  SettingsModel,
+  WebhookModel,
+} from '../models';
+import { RepositoryBroker } from '../repository/repository.manager';
+import { WAStartupService } from './whatsapp.service';
 
 export class WAMonitoringService {
   constructor(
@@ -45,22 +48,20 @@ export class WAMonitoringService {
 
   private dbInstance: Db;
 
+  private dbStore = dbserver;
+
   private readonly logger = new Logger(WAMonitoringService.name);
   public readonly waInstances: Record<string, WAStartupService> = {};
 
   public delInstanceTime(instance: string) {
     const time = this.configService.get<DelInstance>('DEL_INSTANCE');
     if (typeof time === 'number' && time > 0) {
-      this.logger.verbose(
+      this.logger.verbose(`Instance "${instance}" don't have connection, will be removed in ${time} minutes`);
-        `Instance "${instance}" don't have connection, will be removed in ${time} minutes`,
-      );
 
       setTimeout(async () => {
         if (this.waInstances[instance]?.connectionStatus?.state !== 'open') {
           if (this.waInstances[instance]?.connectionStatus?.state === 'connecting') {
-            await this.waInstances[instance]?.client?.logout(
+            await this.waInstances[instance]?.client?.logout('Log out instance: ' + instance);
-              'Log out instance: ' + instance,
-            );
             this.waInstances[instance]?.client?.ws?.close();
             this.waInstances[instance]?.client?.end(undefined);
             delete this.waInstances[instance];
@@ -90,7 +91,7 @@ export class WAMonitoringService {
 
         const findChatwoot = await this.waInstances[key].findChatwoot();
 
-        if (findChatwoot.enabled) {
+        if (findChatwoot && findChatwoot.enabled) {
           chatwoot = {
             ...findChatwoot,
             webhook_url: `${urlServer}/chatwoot/webhook/${key}`,
@@ -112,21 +113,16 @@ export class WAMonitoringService {
           };
 
           if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
-            instanceData.instance['serverUrl'] =
+            instanceData.instance['serverUrl'] = this.configService.get<HttpServer>('SERVER').URL;
-              this.configService.get<HttpServer>('SERVER').URL;
 
-            instanceData.instance['apikey'] = (
+            instanceData.instance['apikey'] = (await this.repository.auth.find(key)).apikey;
-              await this.repository.auth.find(key)
-            ).apikey;
 
             instanceData.instance['chatwoot'] = chatwoot;
           }
 
           instances.push(instanceData);
         } else {
-          this.logger.verbose(
+          this.logger.verbose('instance: ' + key + ' - connectionStatus: ' + value.connectionStatus.state);
-            'instance: ' + key + ' - connectionStatus: ' + value.connectionStatus.state,
-          );
 
           const instanceData = {
             instance: {
@@ -136,12 +132,9 @@ export class WAMonitoringService {
           };
 
           if (this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES) {
-            instanceData.instance['serverUrl'] =
+            instanceData.instance['serverUrl'] = this.configService.get<HttpServer>('SERVER').URL;
-              this.configService.get<HttpServer>('SERVER').URL;
 
-            instanceData.instance['apikey'] = (
+            instanceData.instance['apikey'] = (await this.repository.auth.find(key)).apikey;
-              await this.repository.auth.find(key)
-            ).apikey;
 
             instanceData.instance['chatwoot'] = chatwoot;
           }
@@ -164,14 +157,11 @@ export class WAMonitoringService {
         collections.forEach(async (collection) => {
           const name = collection.namespace.replace(/^[\w-]+./, '');
           await this.dbInstance.collection(name).deleteMany({
-            $or: [
+            $or: [{ _id: { $regex: /^app.state.*/ } }, { _id: { $regex: /^session-.*/ } }],
-              { _id: { $regex: /^app.state.*/ } },
-              { _id: { $regex: /^session-.*/ } },
-            ],
           });
           this.logger.verbose('instance files deleted: ' + name);
         });
-      } else if (this.redis.ENABLED) {
+        // } else if (this.redis.ENABLED) {
       } else {
         const dir = opendirSync(INSTANCE_DIR, { encoding: 'utf-8' });
         for await (const dirent of dir) {
@@ -218,11 +208,8 @@ export class WAMonitoringService {
   }
 
   public async cleaningStoreFiles(instanceName: string) {
-    this.logger.verbose('cleaning store files instance: ' + instanceName);
-
     if (!this.db.ENABLED) {
-      const instance = this.waInstances[instanceName];
+      this.logger.verbose('cleaning store files instance: ' + instanceName);
-
       rmSync(join(INSTANCE_DIR, instanceName), { recursive: true, force: true });
 
       execSync(`rm -rf ${join(STORE_DIR, 'chats', instanceName)}`);
@@ -233,18 +220,29 @@ 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 + '*')}`);
+      execSync(`rm -rf ${join(STORE_DIR, 'settings', instanceName + '*')}`);
+
+      return;
     }
+
+    this.logger.verbose('cleaning store database instance: ' + instanceName);
+
+    await AuthModel.deleteMany({ owner: instanceName });
+    await ContactModel.deleteMany({ owner: instanceName });
+    await MessageModel.deleteMany({ owner: instanceName });
+    await MessageUpModel.deleteMany({ owner: instanceName });
+    await AuthModel.deleteMany({ _id: instanceName });
+    await WebhookModel.deleteMany({ _id: instanceName });
+    await ChatwootModel.deleteMany({ _id: instanceName });
+    await SettingsModel.deleteMany({ _id: instanceName });
+
+    return;
   }
 
   public async loadInstance() {
     this.logger.verbose('load instances');
     const set = async (name: string) => {
-      const instance = new WAStartupService(
+      const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache);
-        this.configService,
-        this.eventEmitter,
-        this.repository,
-        this.cache,
-      );
       instance.instanceName = name;
       this.logger.verbose('instance loaded: ' + name);
 
@@ -264,7 +262,6 @@ export class WAMonitoringService {
           keys.forEach(async (k) => await set(k.split(':')[1]));
         } else {
           this.logger.verbose('no instance keys found');
-          initInstance();
         }
         return;
       }
@@ -275,12 +272,9 @@ export class WAMonitoringService {
         const collections: any[] = await this.dbInstance.collections();
         if (collections.length > 0) {
           this.logger.verbose('reading collections and setting instances');
-          collections.forEach(
+          collections.forEach(async (coll) => await set(coll.namespace.replace(/^[\w-]+\./, '')));
-            async (coll) => await set(coll.namespace.replace(/^[\w-]+\./, '')),
-          );
         } else {
           this.logger.verbose('no collections found');
-          initInstance();
         }
         return;
       }
@@ -301,7 +295,6 @@ export class WAMonitoringService {
           await set(dirent.name);
         } else {
           this.logger.verbose('no instance files found');
-          initInstance();
         }
       }
     } catch (error) {
@@ -315,7 +308,9 @@ export class WAMonitoringService {
       try {
         this.logger.verbose('instance: ' + instanceName + ' - removing from memory');
         this.waInstances[instanceName] = undefined;
-      } catch {}
+      } catch (error) {
+        this.logger.error(error);
+      }
 
       try {
         this.logger.verbose('request cleaning up instance: ' + instanceName);

src/whatsapp/services/settings.service.ts

@@ -0,0 +1,32 @@
+import { Logger } from '../../config/logger.config';
+import { InstanceDto } from '../dto/instance.dto';
+import { SettingsDto } from '../dto/settings.dto';
+import { WAMonitoringService } from './monitor.service';
+
+export class SettingsService {
+  constructor(private readonly waMonitor: WAMonitoringService) {}
+
+  private readonly logger = new Logger(SettingsService.name);
+
+  public create(instance: InstanceDto, data: SettingsDto) {
+    this.logger.verbose('create settings: ' + instance.instanceName);
+    this.waMonitor.waInstances[instance.instanceName].setSettings(data);
+
+    return { settings: { ...instance, settings: data } };
+  }
+
+  public async find(instance: InstanceDto): Promise<SettingsDto> {
+    try {
+      this.logger.verbose('find settings: ' + instance.instanceName);
+      const result = await this.waMonitor.waInstances[instance.instanceName].findSettings();
+
+      if (Object.keys(result).length === 0) {
+        throw new Error('Settings not found');
+      }
+
+      return result;
+    } catch (error) {
+      return { reject_call: false, msg_call: '', groups_ignore: false };
+    }
+  }
+}

src/whatsapp/services/webhook.service.ts

@@ -1,7 +1,7 @@
+import { Logger } from '../../config/logger.config';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WAMonitoringService } from './monitor.service';
-import { Logger } from '../../config/logger.config';
 
 export class WebhookService {
   constructor(private readonly waMonitor: WAMonitoringService) {}
@@ -18,9 +18,7 @@ export class WebhookService {
   public async find(instance: InstanceDto): Promise<WebhookDto> {
     try {
       this.logger.verbose('find webhook: ' + instance.instanceName);
-      const result = await this.waMonitor.waInstances[
+      const result = await this.waMonitor.waInstances[instance.instanceName].findWebhook();
-        instance.instanceName
-      ].findWebhook();
 
       if (Object.keys(result).length === 0) {
         throw new Error('Webhook not found');

src/whatsapp/types/wa.types.ts

@@ -22,12 +22,19 @@ export enum Events {
   GROUPS_UPSERT = 'groups.upsert',
   GROUPS_UPDATE = 'groups.update',
   GROUP_PARTICIPANTS_UPDATE = 'group-participants.update',
+  CALL = 'call',
 }
 
 export declare namespace wa {
-  export type QrCode = { count?: number; base64?: string; code?: string };
+  export type QrCode = {
+    count?: number;
+    pairingCode?: string;
+    base64?: string;
+    code?: string;
+  };
   export type Instance = {
     qrcode?: QrCode;
+    pairingCode?: string;
     authState?: { state: AuthenticationState; saveCreds: () => void };
     name?: string;
     wuid?: string;
@@ -49,6 +56,18 @@ export declare namespace wa {
     url?: string;
     name_inbox?: string;
     sign_msg?: boolean;
+    number?: string;
+    reopen_conversation?: boolean;
+    conversation_pending?: boolean;
+  };
+
+  export type LocalSettings = {
+    reject_call?: boolean;
+    msg_call?: string;
+    groups_ignore?: boolean;
+    always_online?: boolean;
+    read_messages?: boolean;
+    read_status?: boolean;
   };
 
   export type StateConnection = {
@@ -57,22 +76,10 @@ export declare namespace wa {
     statusReason?: number;
   };
 
-  export type StatusMessage =
+  export type StatusMessage = 'ERROR' | 'PENDING' | 'SERVER_ACK' | 'DELIVERY_ACK' | 'READ' | 'DELETED' | 'PLAYED';
-    | 'ERROR'
-    | 'PENDING'
-    | 'SERVER_ACK'
-    | 'DELIVERY_ACK'
-    | 'READ'
-    | 'PLAYED';
 }
 
-export const TypeMediaMessage = [
+export const TypeMediaMessage = ['imageMessage', 'documentMessage', 'audioMessage', 'videoMessage', 'stickerMessage'];
-  'imageMessage',
-  'documentMessage',
-  'audioMessage',
-  'videoMessage',
-  'stickerMessage',
-];
 
 export const MessageSubtype = [
   'ephemeralMessage',

src/whatsapp/whatsapp.module.ts

@@ -1,39 +1,40 @@
-import { Auth, configService } from '../config/env.config';
+import { configService } from '../config/env.config';
-import { Logger } from '../config/logger.config';
 import { eventEmitter } from '../config/event.config';
-import { MessageRepository } from './repository/message.repository';
+import { Logger } from '../config/logger.config';
-import { WAMonitoringService } from './services/monitor.service';
+import { dbserver } from '../db/db.connect';
-import { ChatRepository } from './repository/chat.repository';
+import { RedisCache } from '../db/redis.client';
-import { ContactRepository } from './repository/contact.repository';
-import { MessageUpRepository } from './repository/messageUp.repository';
 import { ChatController } from './controllers/chat.controller';
+import { ChatwootController } from './controllers/chatwoot.controller';
+import { GroupController } from './controllers/group.controller';
 import { InstanceController } from './controllers/instance.controller';
 import { SendMessageController } from './controllers/sendMessage.controller';
-import { AuthService } from './services/auth.service';
+import { SettingsController } from './controllers/settings.controller';
-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,
   ChatModel,
+  ChatwootModel,
   ContactModel,
   MessageModel,
   MessageUpModel,
-  ChatwootModel,
+  SettingsModel,
   WebhookModel,
 } from './models';
-import { dbserver } from '../db/db.connect';
-import { WebhookRepository } from './repository/webhook.repository';
-import { ChatwootRepository } from './repository/chatwoot.repository';
 import { AuthRepository } from './repository/auth.repository';
-import { WAStartupService } from './services/whatsapp.service';
+import { ChatRepository } from './repository/chat.repository';
-import { delay } from '@whiskeysockets/baileys';
+import { ChatwootRepository } from './repository/chatwoot.repository';
-import { Events } from './types/wa.types';
+import { ContactRepository } from './repository/contact.repository';
-import { RedisCache } from '../db/redis.client';
+import { MessageRepository } from './repository/message.repository';
+import { MessageUpRepository } from './repository/messageUp.repository';
+import { RepositoryBroker } from './repository/repository.manager';
+import { SettingsRepository } from './repository/settings.repository';
+import { WebhookRepository } from './repository/webhook.repository';
+import { AuthService } from './services/auth.service';
+import { ChatwootService } from './services/chatwoot.service';
+import { WAMonitoringService } from './services/monitor.service';
+import { SettingsService } from './services/settings.service';
+import { WebhookService } from './services/webhook.service';
 
 const logger = new Logger('WA MODULE');
 
@@ -43,6 +44,7 @@ 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 settingsRepository = new SettingsRepository(SettingsModel, configService);
 const authRepository = new AuthRepository(AuthModel, configService);
 
 export const repository = new RepositoryBroker(
@@ -52,6 +54,7 @@ export const repository = new RepositoryBroker(
   messageUpdateRepository,
   webhookRepository,
   chatwootRepository,
+  settingsRepository,
   authRepository,
   configService,
   dbserver?.getClient(),
@@ -59,12 +62,7 @@ export const repository = new RepositoryBroker(
 
 export const cache = new RedisCache();
 
-export const waMonitor = new WAMonitoringService(
+export const waMonitor = new WAMonitoringService(eventEmitter, configService, repository, cache);
-  eventEmitter,
-  configService,
-  repository,
-  cache,
-);
 
 const authService = new AuthService(configService, waMonitor, repository);
 
@@ -76,6 +74,10 @@ const chatwootService = new ChatwootService(waMonitor, configService);
 
 export const chatwootController = new ChatwootController(chatwootService, configService);
 
+const settingsService = new SettingsService(waMonitor);
+
+export const settingsController = new SettingsController(settingsService);
+
 export const instanceController = new InstanceController(
   waMonitor,
   configService,
@@ -84,6 +86,7 @@ export const instanceController = new InstanceController(
   authService,
   webhookService,
   chatwootService,
+  settingsService,
   cache,
 );
 export const viewsController = new ViewsController(waMonitor, configService);
@@ -91,111 +94,4 @@ export const sendMessageController = new SendMessageController(waMonitor);
 export const chatController = new ChatController(waMonitor);
 export const groupController = new GroupController(waMonitor);
 
-export async function initInstance() {
-  const instance = new WAStartupService(configService, eventEmitter, repository, cache);
-
-  const mode = configService.get<Auth>('AUTHENTICATION').INSTANCE.MODE;
-
-  logger.verbose('Sending data webhook for event: ' + Events.APPLICATION_STARTUP);
-  instance.sendDataWebhook(
-    Events.APPLICATION_STARTUP,
-    {
-      message: 'Application startup',
-      mode,
-    },
-    false,
-  );
-
-  if (mode === 'container') {
-    logger.verbose('Application startup in container mode');
-
-    const instanceName = configService.get<Auth>('AUTHENTICATION').INSTANCE.NAME;
-    logger.verbose('Instance name: ' + instanceName);
-
-    const instanceWebhook =
-      configService.get<Auth>('AUTHENTICATION').INSTANCE.WEBHOOK_URL;
-    logger.verbose('Instance webhook: ' + instanceWebhook);
-
-    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;
-    waMonitor.delInstanceTime(instance.instanceName);
-
-    const hash = await authService.generateHash({
-      instanceName: instance.instanceName,
-      token: configService.get<Auth>('AUTHENTICATION').API_KEY.KEY,
-    });
-    logger.verbose('Hash generated: ' + hash);
-
-    if (instanceWebhook) {
-      logger.verbose('Creating webhook for instance: ' + instanceName);
-      try {
-        webhookService.create(instance, { enabled: true, url: instanceWebhook });
-        logger.verbose('Webhook created');
-      } catch (error) {
-        logger.log(error);
-      }
-    }
-
-    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;
-
-      switch (state) {
-        case 'close':
-          await instance.connectToWhatsapp();
-          await delay(2000);
-          return instance.qrCode;
-        case 'connecting':
-          return instance.qrCode;
-        default:
-          return await this.connectionState({ instanceName });
-      }
-    } catch (error) {
-      logger.log(error);
-    }
-
-    const result = {
-      instance: {
-        instanceName: instance.instanceName,
-        status: 'created',
-      },
-      hash,
-      webhook: instanceWebhook,
-    };
-
-    logger.info(result);
-
-    return result;
-  }
-
-  return null;
-}
-
 logger.info('Module - ON');