Merge branch 'release/1.6.0'

Author: DavidsonGomes

.DS_Store

@@ -5,7 +5,9 @@
   "editor.smoothScrolling": true,
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
-     "source.fixAll.eslint": true,
-     "source.fixAll": true
-  }
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll": "explicit"
+  },
+  "prisma-smart-formatter.typescript.defaultFormatter": "esbenp.prettier-vscode",
+  "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma"
 }

.vscode/settings.json

@@ -1,3 +1,44 @@
+# 1.6.1 (develop)
+
+### Fixed
+
+* Fixed Lid Messages
+
+# 1.6.0 (2023-12-12 17:24)
+
+### Feature
+* Added AWS SQS Integration
+* Added support for new typebot API
+* Added endpoint sendPresence
+* New Instance Manager
+* Added auto_create to the chatwoot set to create the inbox automatically or not
+* Added reply, delete and message reaction in chatwoot v3.3.1
+
+### Fixed
+
+* Adjusts in proxy
+* Adjusts in start session for Typebot
+* Added mimetype field when sending media
+* Ajusts in validations to messages.upsert
+* Fixed messages not received: error handling when updating contact in chatwoot
+* Fix workaround to manage param data as an array in mongodb
+* Removed await from webhook when sending a message
+* Update typebot.service.ts - element.underline change ~ for *
+* Adjusts in proxy
+* Removed api restart on receiving an error
+* Fixes in mongodb and chatwoot
+* Adjusted return from queries in mongodb
+* Added restart instance when update profile picture
+* Correction of chatwoot functioning with admin flows
+* Fixed problem that did not generate qrcode with the chatwoot_conversation_pending option enabled
+* Fixed issue where CSAT opened a new ticket when reopen_conversation was disabled
+* Fixed issue sending contact to Chatwoot via iOS
+
+### Integrations
+
+- Chatwoot: v3.3.1
+- Typebot: v2.20.0
+
 # 1.5.4 (2023-10-09 20:43)
 
 ### Fixed

CHANGELOG.md

@@ -51,6 +51,12 @@ RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
 
 WEBSOCKET_ENABLED=false
 
+SQS_ENABLED=false
+SQS_ACCESS_KEY_ID=
+SQS_SECRET_ACCESS_KEY=
+SQS_ACCOUNT_ID=
+SQS_REGION=
+
 # Global Webhook Settings
 # Each instance's Webhook URL and events will be requested at the time it is created
 ## Define a global webhook that will listen for enabled events from all instances
@@ -99,6 +105,9 @@ CONFIG_SESSION_PHONE_NAME=Chrome
 QRCODE_LIMIT=30
 QRCODE_COLOR=#198754
 
+# old | latest
+TYPEBOT_API_VERSION=latest
+
 # Defines an authentication type for the api
 # We recommend using the apikey because it will allow you to use a custom token,
 # if you use jwt, a random token will be generated and may be expired and you will have to generate a new token

Docker/.env.example

@@ -1,6 +1,6 @@
 FROM node:20.7.0-alpine
 
-LABEL version="1.5.4" description="Api to control whatsapp features through http requests." 
+LABEL version="1.6.0" description="Api to control whatsapp features through http requests." 
 LABEL maintainer="Davidson Gomes" git="https://github.com/DavidsonGomes"
 LABEL contact="[email protected]"
 
@@ -56,6 +56,12 @@ ENV RABBITMQ_URI=amqp://guest:guest@rabbitmq:5672
 
 ENV WEBSOCKET_ENABLED=false
 
+ENV SQS_ENABLED=false
+ENV SQS_ACCESS_KEY_ID=
+ENV SQS_SECRET_ACCESS_KEY=
+ENV SQS_ACCOUNT_ID=
+ENV SQS_REGION=
+
 ENV WEBHOOK_GLOBAL_URL=
 ENV WEBHOOK_GLOBAL_ENABLED=false
 
@@ -98,6 +104,8 @@ ENV CONFIG_SESSION_PHONE_NAME=Chrome
 ENV QRCODE_LIMIT=30
 ENV QRCODE_COLOR=#198754
 
+ENV TYPEBOT_API_VERSION=latest
+
 ENV AUTHENTICATION_TYPE=apikey
 
 ENV AUTHENTICATION_API_KEY=B6D711FCDE4D4FD5936544120E713976

Dockerfile

@@ -39,12 +39,13 @@ This code was produced based on the baileys library and it is still under develo
   </a>
 </div>
 
-#### Buy me coffe
+#### Buy me coffe - PIX
 
 <div align="center">
   <a href="https://bmc.link/evolutionapi" target="_blank" rel="noopener noreferrer">
-    <img src="./public/images/bmc_qr.png" style="width: 50% !important;">
+    <img src="./public/images/qrcode-pix.png" style="width: 50% !important;">
   </a>
+  <p><b>CHAVE PIX (Telefone):</b> (74)99987-9409</p>
 </div>
 
 </br>

README.md

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {
@@ -48,13 +48,15 @@
     "@sentry/node": "^7.59.2",
     "@whiskeysockets/baileys": "^6.5.0",
     "amqplib": "^0.10.3",
+    "aws-sdk": "^2.1499.0",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.7",
     "eventemitter2": "^6.4.9",
+    "evolution-manager": "^0.4.4",
     "exiftool-vendored": "^22.0.0",
     "express": "^4.18.2",
     "express-async-errors": "^3.1.1",

package.json

@@ -66,12 +66,16 @@ export type Rabbitmq = {
   URI: string;
 };
 
-export type Websocket = {
+export type Sqs = {
   ENABLED: boolean;
+  ACCESS_KEY_ID: string;
+  SECRET_ACCESS_KEY: string;
+  ACCOUNT_ID: string;
+  REGION: string;
 };
 
-export type Chatwoot = {
-  USE_REPLY_ID: boolean;
+export type Websocket = {
+  ENABLED: boolean;
 };
 
 export type EventsWebhook = {
@@ -124,6 +128,7 @@ export type SslConf = { PRIVKEY: string; FULLCHAIN: string };
 export type Webhook = { GLOBAL?: GlobalWebhook; EVENTS: EventsWebhook };
 export type ConfigSessionPhone = { CLIENT: string; NAME: string };
 export type QrCode = { LIMIT: number; COLOR: string };
+export type Typebot = { API_VERSION: string };
 export type Production = boolean;
 
 export interface Env {
@@ -135,15 +140,16 @@ export interface Env {
   DATABASE: Database;
   REDIS: Redis;
   RABBITMQ: Rabbitmq;
+  SQS: Sqs;
   WEBSOCKET: Websocket;
   LOG: Log;
   DEL_INSTANCE: DelInstance;
   WEBHOOK: Webhook;
   CONFIG_SESSION_PHONE: ConfigSessionPhone;
   QRCODE: QrCode;
+  TYPEBOT: Typebot;
   AUTHENTICATION: Auth;
   PRODUCTION?: Production;
-  CHATWOOT?: Chatwoot;
 }
 
 export type Key = keyof Env;
@@ -226,6 +232,13 @@ export class ConfigService {
         ENABLED: process.env?.RABBITMQ_ENABLED === 'true',
         URI: process.env.RABBITMQ_URI || '',
       },
+      SQS: {
+        ENABLED: process.env?.SQS_ENABLED === 'true',
+        ACCESS_KEY_ID: process.env.SQS_ACCESS_KEY_ID || '',
+        SECRET_ACCESS_KEY: process.env.SQS_SECRET_ACCESS_KEY || '',
+        ACCOUNT_ID: process.env.SQS_ACCOUNT_ID || '',
+        REGION: process.env.SQS_REGION || '',
+      },
       WEBSOCKET: {
         ENABLED: process.env?.WEBSOCKET_ENABLED === 'true',
       },
@@ -289,6 +302,9 @@ export class ConfigService {
         LIMIT: Number.parseInt(process.env.QRCODE_LIMIT) || 30,
         COLOR: process.env.QRCODE_COLOR || '#198754',
       },
+      TYPEBOT: {
+        API_VERSION: process.env?.TYPEBOT_API_VERSION || 'old',
+      },
       AUTHENTICATION: {
         TYPE: process.env.AUTHENTICATION_TYPE as 'apikey',
         API_KEY: {
@@ -302,9 +318,6 @@ export class ConfigService {
           SECRET: process.env.AUTHENTICATION_JWT_SECRET || 'L=0YWt]b2w[WF>#>:&E`',
         },
       },
-      CHATWOOT: {
-        USE_REPLY_ID: process.env?.USE_REPLY_ID === 'true',
-      },
     };
   }
 }

public/images/qrcode-pix.png

@@ -8,7 +8,6 @@ export function onUnexpectedError() {
       stderr: process.stderr.fd,
       error,
     });
-    process.exit(1);
   });
 
   process.on('unhandledRejection', (error, origin) => {
@@ -18,6 +17,5 @@ export function onUnexpectedError() {
       stderr: process.stderr.fd,
       error,
     });
-    process.exit(1);
   });
 }

src/config/env.config.ts

@@ -83,6 +83,13 @@ RABBITMQ:
   ENABLED: false
   URI: "amqp://guest:guest@localhost:5672"
 
+SQS:
+  ENABLED: true
+  ACCESS_KEY_ID: ""
+  SECRET_ACCESS_KEY: ""
+  ACCOUNT_ID: ""
+  REGION: "us-east-1"
+
 WEBSOCKET:
   ENABLED: false
 
@@ -139,6 +146,9 @@ QRCODE:
   LIMIT: 30
   COLOR: "#198754"
 
+TYPEBOT:
+  API_VERSION: 'old' # old | latest
+
 # Defines an authentication type for the api
 # We recommend using the apikey because it will allow you to use a custom token,
 # if you use jwt, a random token will be generated and may be expired and you will have to generate a new token
@@ -154,7 +164,3 @@ AUTHENTICATION:
   JWT:
     EXPIRIN_IN: 0 # seconds - 3600s === 1h | zero (0) - never expires
     SECRET: L=0YWt]b2w[WF>#>:&E`
-
-# Configure to chatwoot
-CHATWOOT:
-  USE_REPLY_ID: false

src/config/error.config.ts

@@ -25,7 +25,7 @@ info:
     </font>
 
     [![Run in Postman](https://run.pstmn.io/button.svg)](https://god.gw.postman.com/run-collection/26869335-5546d063-156b-4529-915f-909dd628c090?action=collection%2Ffork&source=rip_markdown&collection-url=entityId%3D26869335-5546d063-156b-4529-915f-909dd628c090%26entityType%3Dcollection%26workspaceId%3D339a4ee7-378b-45c9-b5b8-fd2c0a9c2442)
-  version: 1.5.4
+  version: 1.5.5
   contact:
     name: DavidsonGomes
     email: [email protected]

src/dev-env.yml

@@ -5,49 +5,55 @@ import { Redis } from '../config/env.config';
 import { Logger } from '../config/logger.config';
 
 export class RedisCache {
-  async disconnect() {
-    await this.client.disconnect();
-    this.statusConnection = false;
-  }
-  constructor() {
-    this.logger.verbose('instance created');
-    process.on('beforeExit', async () => {
-      this.logger.verbose('instance destroyed');
-      if (this.statusConnection) {
-        this.logger.verbose('instance disconnect');
-        await this.client.disconnect();
-      }
-    });
-  }
-
+  private readonly logger = new Logger(RedisCache.name);
+  private client: RedisClientType;
   private statusConnection = false;
   private instanceName: string;
   private redisEnv: Redis;
 
+  constructor() {
+    this.logger.verbose('RedisCache instance created');
+    process.on('beforeExit', () => {
+      this.logger.verbose('RedisCache instance destroyed');
+      this.disconnect();
+    });
+  }
+
   public set reference(reference: string) {
     this.logger.verbose('set reference: ' + reference);
     this.instanceName = reference;
   }
 
   public async connect(redisEnv: Redis) {
-    this.logger.verbose('connecting');
+    this.logger.verbose('Connecting to Redis...');
     this.client = createClient({ url: redisEnv.URI });
-    this.logger.verbose('connected in ' + redisEnv.URI);
+    this.client.on('error', (err) => this.logger.error('Redis Client Error ' + err));
+
     await this.client.connect();
     this.statusConnection = true;
     this.redisEnv = redisEnv;
+    this.logger.verbose(`Connected to ${redisEnv.URI}`);
   }
 
-  private readonly logger = new Logger(RedisCache.name);
-  private client: RedisClientType;
+  public async disconnect() {
+    if (this.statusConnection) {
+      await this.client.disconnect();
+      this.statusConnection = false;
+      this.logger.verbose('Redis client disconnected');
+    }
+  }
 
   public async instanceKeys(): Promise<string[]> {
+    const keys: string[] = [];
     try {
-      this.logger.verbose('instance keys: ' + this.redisEnv.PREFIX_KEY + ':*');
-      return await this.client.sendCommand(['keys', this.redisEnv.PREFIX_KEY + ':*']);
+      this.logger.verbose('Fetching instance keys');
+      for await (const key of this.client.scanIterator({ MATCH: `${this.redisEnv.PREFIX_KEY}:*` })) {
+        keys.push(key);
+      }
     } catch (error) {
-      this.logger.error(error);
+      this.logger.error('Error fetching instance keys ' + error);
     }
+    return keys;
   }
 
   public async keyExists(key?: string) {