From cf89601269af86a664043e3d8360ae1294d2d216 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Sun, 17 Dec 2023 06:59:05 -0300 Subject: [PATCH] fix: include instance Id field in the instance configuration --- CHANGELOG.md | 4 ++++ src/whatsapp/controllers/instance.controller.ts | 7 +++++++ src/whatsapp/dto/instance.dto.ts | 1 + src/whatsapp/models/auth.model.ts | 2 ++ src/whatsapp/repository/auth.repository.ts | 1 + src/whatsapp/services/auth.service.ts | 7 +++++-- src/whatsapp/services/monitor.service.ts | 2 ++ 7 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 510abf7e..4e8bc2fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ * Fixed sending variables to typebot * Fixed sending variables from typebot * Correction sending s3/minio media to chatwoot and typebot +* Fixed the problem with typebot closing at the end of the flow, now this is optional with the TYPEBOT_KEEP_OPEN variable +* Fixed chatwoot Bold, Italic and Underline formatting using Regex +* Added the sign_delimiter property to the Chatwoot configuration, allowing you to set a different delimiter for the signature. Default when not defined \n +* Include instance Id field in the instance configuration # 1.6.0 (2023-12-12 17:24) diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts index 7ff09426..275a1554 100644 --- a/src/whatsapp/controllers/instance.controller.ts +++ b/src/whatsapp/controllers/instance.controller.ts @@ -1,6 +1,7 @@ import { delay } from '@whiskeysockets/baileys'; import { isURL } from 'class-validator'; import EventEmitter2 from 'eventemitter2'; +import { v4 } from 'uuid'; import { ConfigService, HttpServer } from '../../config/env.config'; import { Logger } from '../../config/logger.config'; @@ -87,8 +88,11 @@ export class InstanceController { const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache); instance.instanceName = instanceName; + const instanceId = v4(); + instance.sendDataWebhook(Events.INSTANCE_CREATE, { instanceName, + instanceId: instanceId, }); this.logger.verbose('instance: ' + instance.instanceName + ' created'); @@ -100,6 +104,7 @@ export class InstanceController { const hash = await this.authService.generateHash( { instanceName: instance.instanceName, + instanceId: instanceId, }, token, ); @@ -367,6 +372,7 @@ export class InstanceController { const result = { instance: { instanceName: instance.instanceName, + instanceId: instanceId, status: 'created', }, hash, @@ -459,6 +465,7 @@ export class InstanceController { return { instance: { instanceName: instance.instanceName, + instanceId: instanceId, status: 'created', }, hash, diff --git a/src/whatsapp/dto/instance.dto.ts b/src/whatsapp/dto/instance.dto.ts index c63620c5..2bf5c362 100644 --- a/src/whatsapp/dto/instance.dto.ts +++ b/src/whatsapp/dto/instance.dto.ts @@ -1,5 +1,6 @@ export class InstanceDto { instanceName: string; + instanceId?: string; qrcode?: boolean; number?: string; token?: string; diff --git a/src/whatsapp/models/auth.model.ts b/src/whatsapp/models/auth.model.ts index 0f7d5ec3..9ae5537f 100644 --- a/src/whatsapp/models/auth.model.ts +++ b/src/whatsapp/models/auth.model.ts @@ -6,12 +6,14 @@ export class AuthRaw { _id?: string; jwt?: string; apikey?: string; + instanceId?: string; } const authSchema = new Schema({ _id: { type: String, _id: true }, jwt: { type: String, minlength: 1 }, apikey: { type: String, minlength: 1 }, + instanceId: { type: String, minlength: 1 }, }); export const AuthModel = dbserver?.model(AuthRaw.name, authSchema, 'authentication'); diff --git a/src/whatsapp/repository/auth.repository.ts b/src/whatsapp/repository/auth.repository.ts index 4da8980b..5720cccb 100644 --- a/src/whatsapp/repository/auth.repository.ts +++ b/src/whatsapp/repository/auth.repository.ts @@ -19,6 +19,7 @@ export class AuthRepository extends Repository { public async create(data: AuthRaw, instance: string): Promise { try { this.logger.verbose('creating auth'); + if (this.dbSettings.ENABLED) { this.logger.verbose('saving auth to db'); const insert = await this.authModel.replaceOne({ _id: instance }, { ...data }, { upsert: true }); diff --git a/src/whatsapp/services/auth.service.ts b/src/whatsapp/services/auth.service.ts index 915a07b7..45a43551 100644 --- a/src/whatsapp/services/auth.service.ts +++ b/src/whatsapp/services/auth.service.ts @@ -46,7 +46,10 @@ export class AuthService { this.logger.verbose('JWT token created: ' + token); - const auth = await this.repository.auth.create({ jwt: token }, instance.instanceName); + const auth = await this.repository.auth.create( + { jwt: token, instanceId: instance.instanceId }, + instance.instanceName, + ); this.logger.verbose('JWT token saved in database'); @@ -66,7 +69,7 @@ export class AuthService { this.logger.verbose(token ? 'APIKEY defined: ' + apikey : 'APIKEY created: ' + apikey); - const auth = await this.repository.auth.create({ apikey }, instance.instanceName); + const auth = await this.repository.auth.create({ apikey, instanceId: instance.instanceId }, instance.instanceName); this.logger.verbose('APIKEY saved in database'); diff --git a/src/whatsapp/services/monitor.service.ts b/src/whatsapp/services/monitor.service.ts index 766569de..54193664 100644 --- a/src/whatsapp/services/monitor.service.ts +++ b/src/whatsapp/services/monitor.service.ts @@ -112,6 +112,7 @@ export class WAMonitoringService { const instanceData = { instance: { instanceName: key, + instanceId: (await this.repository.auth.find(key))?.instanceId, owner: value.wuid, profileName: (await value.getProfileName()) || 'not loaded', profilePictureUrl: value.profilePictureUrl, @@ -135,6 +136,7 @@ export class WAMonitoringService { const instanceData = { instance: { instanceName: key, + instanceId: (await this.repository.auth.find(key))?.instanceId, status: value.connectionStatus.state, }, };