feat: Added debounce time for typebot messages

EvolutionAPI · Jun 11, 2024 · 2776f11 · 2776f11
1 parent 0bf8e55
commit 2776f11
Show file tree

Hide file tree

Showing 21 changed files with 752 additions and 251 deletions.
diff --git a/.env.example b/.env.example
@@ -123,7 +123,7 @@ CACHE_REDIS_ENABLED=true
 CACHE_REDIS_URI=redis://localhost:6379/6
 CACHE_REDIS_PREFIX_KEY=evolution
 CACHE_REDIS_SAVE_INSTANCES=false
-CACHE_LOCAL_ENABLED=true
+CACHE_LOCAL_ENABLED=false
 
 AUTHENTICATION_API_KEY=429683C4C977415CAAFCCE10F7D57E11
 AUTHENTICATION_EXPOSE_IN_FETCH_INSTANCES=true

diff --git a/prisma/migrations/20240611202817_create_columns_debounce_time_typebot/migration.sql b/prisma/migrations/20240611202817_create_columns_debounce_time_typebot/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Typebot" ADD COLUMN     "debounceTime" INTEGER;
+
+-- AlterTable
+ALTER TABLE "TypebotSetting" ADD COLUMN     "debounceTime" INTEGER;
diff --git a/prisma/mysql-schema.prisma b/prisma/mysql-schema.prisma
@@ -262,6 +262,7 @@ model Typebot {
   listeningFromMe Boolean?         @default(false)
   stopBotFromMe   Boolean?         @default(false)
   keepOpen        Boolean?         @default(false)
+  debounceTime    Int?             @db.Int
   createdAt       DateTime?        @default(now()) @db.Date
   updatedAt       DateTime?        @updatedAt @db.Date
   triggerType     TriggerType?
@@ -279,6 +280,7 @@ model TypebotSession {
   sessionId          String    @db.VarChar(100)
   status             String    @db.VarChar(100)
   prefilledVariables Json?     @db.Json
+  debounceTime       Int?      @db.Int
   createdAt          DateTime? @default(now()) @db.Date
   updatedAt          DateTime  @updatedAt @db.Date
   Typebot            Typebot   @relation(fields: [typebotId], references: [id], onDelete: Cascade)

diff --git a/prisma/postgresql-schema.prisma b/prisma/postgresql-schema.prisma
@@ -261,6 +261,7 @@ model Typebot {
   listeningFromMe Boolean?         @default(false) @db.Boolean
   stopBotFromMe   Boolean?         @default(false) @db.Boolean
   keepOpen        Boolean?         @default(false) @db.Boolean
+  debounceTime    Int?             @db.Integer
   createdAt       DateTime?        @default(now()) @db.Timestamp
   updatedAt       DateTime?        @updatedAt @db.Timestamp
   triggerType     TriggerType?
@@ -297,6 +298,7 @@ model TypebotSetting {
   listeningFromMe Boolean?  @default(false) @db.Boolean
   stopBotFromMe   Boolean?  @default(false) @db.Boolean
   keepOpen        Boolean?  @default(false) @db.Boolean
+  debounceTime    Int?      @db.Integer
   createdAt       DateTime? @default(now()) @db.Timestamp
   updatedAt       DateTime  @updatedAt @db.Timestamp
   Instance        Instance  @relation(fields: [instanceId], references: [id], onDelete: Cascade)

diff --git a/src/api/controllers/instance.controller.ts b/src/api/controllers/instance.controller.ts
@@ -7,7 +7,6 @@ import { v4 } from 'uuid';
 import { Auth, Chatwoot, ConfigService, HttpServer, WaBusiness } from '../../config/env.config';
 import { Logger } from '../../config/logger.config';
 import { BadRequestException, InternalServerErrorException, UnauthorizedException } from '../../exceptions';
-import { Events as EventsArray } from '../../validate/validate.schema';
 import { InstanceDto, SetPresenceDto } from '../dto/instance.dto';
 import { ChatwootService } from '../integrations/chatwoot/services/chatwoot.service';
 import { RabbitmqService } from '../integrations/rabbitmq/services/rabbitmq.service';
@@ -154,7 +153,33 @@ export class InstanceController {
         try {
           let newEvents: string[] = [];
           if (webhookEvents.length === 0) {
-            newEvents = EventsArray;
+            newEvents = [
+              'APPLICATION_STARTUP',
+              'QRCODE_UPDATED',
+              'MESSAGES_SET',
+              'MESSAGES_UPSERT',
+              'MESSAGES_EDITED',
+              'MESSAGES_UPDATE',
+              'MESSAGES_DELETE',
+              'SEND_MESSAGE',
+              'CONTACTS_SET',
+              'CONTACTS_UPSERT',
+              'CONTACTS_UPDATE',
+              'PRESENCE_UPDATE',
+              'CHATS_SET',
+              'CHATS_UPSERT',
+              'CHATS_UPDATE',
+              'CHATS_DELETE',
+              'GROUPS_UPSERT',
+              'GROUP_UPDATE',
+              'GROUP_PARTICIPANTS_UPDATE',
+              'CONNECTION_UPDATE',
+              'LABELS_EDIT',
+              'LABELS_ASSOCIATION',
+              'CALL',
+              'TYPEBOT_START',
+              'TYPEBOT_CHANGE_STATUS',
+            ];
           } else {
             newEvents = webhookEvents;
           }
@@ -180,7 +205,33 @@ export class InstanceController {
         try {
           let newEvents: string[] = [];
           if (websocketEvents.length === 0) {
-            newEvents = EventsArray;
+            newEvents = [
+              'APPLICATION_STARTUP',
+              'QRCODE_UPDATED',
+              'MESSAGES_SET',
+              'MESSAGES_UPSERT',
+              'MESSAGES_EDITED',
+              'MESSAGES_UPDATE',
+              'MESSAGES_DELETE',
+              'SEND_MESSAGE',
+              'CONTACTS_SET',
+              'CONTACTS_UPSERT',
+              'CONTACTS_UPDATE',
+              'PRESENCE_UPDATE',
+              'CHATS_SET',
+              'CHATS_UPSERT',
+              'CHATS_UPDATE',
+              'CHATS_DELETE',
+              'GROUPS_UPSERT',
+              'GROUP_UPDATE',
+              'GROUP_PARTICIPANTS_UPDATE',
+              'CONNECTION_UPDATE',
+              'LABELS_EDIT',
+              'LABELS_ASSOCIATION',
+              'CALL',
+              'TYPEBOT_START',
+              'TYPEBOT_CHANGE_STATUS',
+            ];
           } else {
             newEvents = websocketEvents;
           }
@@ -205,7 +256,33 @@ export class InstanceController {
         try {
           let newEvents: string[] = [];
           if (rabbitmqEvents.length === 0) {
-            newEvents = EventsArray;
+            newEvents = [
+              'APPLICATION_STARTUP',
+              'QRCODE_UPDATED',
+              'MESSAGES_SET',
+              'MESSAGES_UPSERT',
+              'MESSAGES_EDITED',
+              'MESSAGES_UPDATE',
+              'MESSAGES_DELETE',
+              'SEND_MESSAGE',
+              'CONTACTS_SET',
+              'CONTACTS_UPSERT',
+              'CONTACTS_UPDATE',
+              'PRESENCE_UPDATE',
+              'CHATS_SET',
+              'CHATS_UPSERT',
+              'CHATS_UPDATE',
+              'CHATS_DELETE',
+              'GROUPS_UPSERT',
+              'GROUP_UPDATE',
+              'GROUP_PARTICIPANTS_UPDATE',
+              'CONNECTION_UPDATE',
+              'LABELS_EDIT',
+              'LABELS_ASSOCIATION',
+              'CALL',
+              'TYPEBOT_START',
+              'TYPEBOT_CHANGE_STATUS',
+            ];
           } else {
             newEvents = rabbitmqEvents;
           }
@@ -228,7 +305,33 @@ export class InstanceController {
         try {
           let newEvents: string[] = [];
           if (sqsEvents.length === 0) {
-            newEvents = EventsArray;
+            newEvents = [
+              'APPLICATION_STARTUP',
+              'QRCODE_UPDATED',
+              'MESSAGES_SET',
+              'MESSAGES_UPSERT',
+              'MESSAGES_EDITED',
+              'MESSAGES_UPDATE',
+              'MESSAGES_DELETE',
+              'SEND_MESSAGE',
+              'CONTACTS_SET',
+              'CONTACTS_UPSERT',
+              'CONTACTS_UPDATE',
+              'PRESENCE_UPDATE',
+              'CHATS_SET',
+              'CHATS_UPSERT',
+              'CHATS_UPDATE',
+              'CHATS_DELETE',
+              'GROUPS_UPSERT',
+              'GROUP_UPDATE',
+              'GROUP_PARTICIPANTS_UPDATE',
+              'CONNECTION_UPDATE',
+              'LABELS_EDIT',
+              'LABELS_ASSOCIATION',
+              'CALL',
+              'TYPEBOT_START',
+              'TYPEBOT_CHANGE_STATUS',
+            ];
           } else {
             newEvents = sqsEvents;
           }

diff --git a/src/api/controllers/webhook.controller.ts b/src/api/controllers/webhook.controller.ts
@@ -1,7 +1,6 @@
 import { isURL } from 'class-validator';
 
 import { BadRequestException } from '../../exceptions';
-import { Events } from '../../validate/validate.schema';
 import { InstanceDto } from '../dto/instance.dto';
 import { WebhookDto } from '../dto/webhook.dto';
 import { WAMonitoringService } from '../services/monitor.service';
@@ -21,7 +20,33 @@ export class WebhookController {
       data.url = '';
       data.events = [];
     } else if (data.events.length === 0) {
-      data.events = Events;
+      data.events = [
+        'APPLICATION_STARTUP',
+        'QRCODE_UPDATED',
+        'MESSAGES_SET',
+        'MESSAGES_UPSERT',
+        'MESSAGES_EDITED',
+        'MESSAGES_UPDATE',
+        'MESSAGES_DELETE',
+        'SEND_MESSAGE',
+        'CONTACTS_SET',
+        'CONTACTS_UPSERT',
+        'CONTACTS_UPDATE',
+        'PRESENCE_UPDATE',
+        'CHATS_SET',
+        'CHATS_UPSERT',
+        'CHATS_UPDATE',
+        'CHATS_DELETE',
+        'GROUPS_UPSERT',
+        'GROUP_UPDATE',
+        'GROUP_PARTICIPANTS_UPDATE',
+        'CONNECTION_UPDATE',
+        'LABELS_EDIT',
+        'LABELS_ASSOCIATION',
+        'CALL',
+        'TYPEBOT_START',
+        'TYPEBOT_CHANGE_STATUS',
+      ];
     }
 
     return this.webhookService.create(instance, data);

diff --git a/src/api/integrations/rabbitmq/controllers/rabbitmq.controller.ts b/src/api/integrations/rabbitmq/controllers/rabbitmq.controller.ts
@@ -1,6 +1,5 @@
 import { configService, Rabbitmq } from '../../../../config/env.config';
 import { BadRequestException } from '../../../../exceptions';
-import { Events } from '../../../../validate/validate.schema';
 import { InstanceDto } from '../../../dto/instance.dto';
 import { RabbitmqDto } from '../dto/rabbitmq.dto';
 import { RabbitmqService } from '../services/rabbitmq.service';
@@ -16,7 +15,33 @@ export class RabbitmqController {
     }
 
     if (data.events.length === 0) {
-      data.events = Events;
+      data.events = [
+        'APPLICATION_STARTUP',
+        'QRCODE_UPDATED',
+        'MESSAGES_SET',
+        'MESSAGES_UPSERT',
+        'MESSAGES_EDITED',
+        'MESSAGES_UPDATE',
+        'MESSAGES_DELETE',
+        'SEND_MESSAGE',
+        'CONTACTS_SET',
+        'CONTACTS_UPSERT',
+        'CONTACTS_UPDATE',
+        'PRESENCE_UPDATE',
+        'CHATS_SET',
+        'CHATS_UPSERT',
+        'CHATS_UPDATE',
+        'CHATS_DELETE',
+        'GROUPS_UPSERT',
+        'GROUP_UPDATE',
+        'GROUP_PARTICIPANTS_UPDATE',
+        'CONNECTION_UPDATE',
+        'LABELS_EDIT',
+        'LABELS_ASSOCIATION',
+        'CALL',
+        'TYPEBOT_START',
+        'TYPEBOT_CHANGE_STATUS',
+      ];
     }
 
     return this.rabbitmqService.create(instance, data);

diff --git a/src/api/integrations/rabbitmq/routes/rabbitmq.router.ts b/src/api/integrations/rabbitmq/routes/rabbitmq.router.ts
@@ -12,6 +12,7 @@ export class RabbitmqRouter extends RouterBroker {
     super();
     this.router
       .post(this.routerPath('set'), ...guards, async (req, res) => {
+        console.log('RabbitmqRouter -> constructor -> req', req.body);
         const response = await this.dataValidate<RabbitmqDto>({
           request: req,
           schema: rabbitmqSchema,

diff --git a/src/api/integrations/rabbitmq/validate/rabbitmq.schema.ts b/src/api/integrations/rabbitmq/validate/rabbitmq.schema.ts
@@ -1,8 +1,6 @@
 import { JSONSchema7 } from 'json-schema';
 import { v4 } from 'uuid';
 
-import { Events } from '../../../../validate/validate.schema';
-
 const isNotEmpty = (...propertyNames: string[]): JSONSchema7 => {
   const properties = {};
   propertyNames.forEach(
@@ -32,7 +30,33 @@ export const rabbitmqSchema: JSONSchema7 = {
       minItems: 0,
       items: {
         type: 'string',
-        enum: Events,
+        enum: [
+          'APPLICATION_STARTUP',
+          'QRCODE_UPDATED',
+          'MESSAGES_SET',
+          'MESSAGES_UPSERT',
+          'MESSAGES_EDITED',
+          'MESSAGES_UPDATE',
+          'MESSAGES_DELETE',
+          'SEND_MESSAGE',
+          'CONTACTS_SET',
+          'CONTACTS_UPSERT',
+          'CONTACTS_UPDATE',
+          'PRESENCE_UPDATE',
+          'CHATS_SET',
+          'CHATS_UPSERT',
+          'CHATS_UPDATE',
+          'CHATS_DELETE',
+          'GROUPS_UPSERT',
+          'GROUP_UPDATE',
+          'GROUP_PARTICIPANTS_UPDATE',
+          'CONNECTION_UPDATE',
+          'LABELS_EDIT',
+          'LABELS_ASSOCIATION',
+          'CALL',
+          'TYPEBOT_START',
+          'TYPEBOT_CHANGE_STATUS',
+        ],
       },
     },
   },

diff --git a/src/api/integrations/sqs/controllers/sqs.controller.ts b/src/api/integrations/sqs/controllers/sqs.controller.ts
@@ -1,6 +1,5 @@
 import { configService, Sqs } from '../../../../config/env.config';
 import { BadRequestException } from '../../../../exceptions';
-import { Events } from '../../../../validate/validate.schema';
 import { InstanceDto } from '../../../dto/instance.dto';
 import { SqsDto } from '../dto/sqs.dto';
 import { SqsService } from '../services/sqs.service';
@@ -16,7 +15,33 @@ export class SqsController {
     }
 
     if (data.events.length === 0) {
-      data.events = Events;
+      data.events = [
+        'APPLICATION_STARTUP',
+        'QRCODE_UPDATED',
+        'MESSAGES_SET',
+        'MESSAGES_UPSERT',
+        'MESSAGES_EDITED',
+        'MESSAGES_UPDATE',
+        'MESSAGES_DELETE',
+        'SEND_MESSAGE',
+        'CONTACTS_SET',
+        'CONTACTS_UPSERT',
+        'CONTACTS_UPDATE',
+        'PRESENCE_UPDATE',
+        'CHATS_SET',
+        'CHATS_UPSERT',
+        'CHATS_UPDATE',
+        'CHATS_DELETE',
+        'GROUPS_UPSERT',
+        'GROUP_UPDATE',
+        'GROUP_PARTICIPANTS_UPDATE',
+        'CONNECTION_UPDATE',
+        'LABELS_EDIT',
+        'LABELS_ASSOCIATION',
+        'CALL',
+        'TYPEBOT_START',
+        'TYPEBOT_CHANGE_STATUS',
+      ];
     }
 
     return this.sqsService.create(instance, data);