Squashed commit of the following:

commit fb6e58b3c4 Merge: 1d3d557 67e9845 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:39:37 2023 -0300 Merge branch 'release/1.4.5' commit 67e98456bb Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:39:27 2023 -0300 fix: Fix mids going duplicated in chatwoot commit 3e47420534 Merge: 3f41974 1d3d557 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:38:44 2023 -0300 Merge tag '1.4.5' into develop * Fixed problems in localization template in chatwoot * Fix mids going duplicated in chatwoot commit 1d3d557c43 Merge: 6b926dc 3f41974 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:38:36 2023 -0300 Merge branch 'release/1.4.5' commit 3f41974a75 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:38:22 2023 -0300 fix: Fix mids going duplicated in chatwoot commit 3e3c7397a5 Merge: de0c9a1 dcb5170 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:36:10 2023 -0300 Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop commit dcb51702e7 Merge: 4769d75 dd0c1e2 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:36:01 2023 -0300 Merge pull request #30 from codephix/patch-1 Update whatsapp.service.ts commit de0c9a1eff Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Wed Jul 26 09:34:10 2023 -0300 fix: fixed problems in localization template commit dd0c1e20a7 Author: CodePhix <contato@codephix.com> Date: Tue Jul 25 19:59:42 2023 -0300 Update whatsapp.service.ts commit 4769d75dc3 Merge: ecae077 6b926dc Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 16:20:04 2023 -0300 Merge tag '1.4.4' into develop * 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 commit 6b926dc697 Merge: 2b6dbfd ecae077 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 16:19:54 2023 -0300 Merge branch 'release/1.4.4' commit ecae077c6d Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 16:16:49 2023 -0300 fix: Option conversation_pending in chatwoot endpoint commit 78ab1bed35 Merge: 6bb1abd 2b6dbfd Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 15:31:16 2023 -0300 Merge tag '1.4.4' into develop * 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 commit 2b6dbfde6b Merge: 82b1567 6bb1abd Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 15:31:06 2023 -0300 Merge branch 'release/1.4.4' commit 6bb1abd7f0 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 15:29:42 2023 -0300 fix: Option conversation_pending in chatwoot endpoint commit aef92240cc Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 15:20:21 2023 -0300 fix: Option conversation_pending in chatwoot endpoint commit f0d8c2d095 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 13:19:15 2023 -0300 fix: Solved receive location in chatwoot commit 14529f2c35 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 12:47:35 2023 -0300 fix: When requesting the pairing code, it also brings the qr code commit 89f40d54d9 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 12:41:54 2023 -0300 fix: Solved receive location in chatwoot commit 4c006970a2 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 11:52:26 2023 -0300 fix: Fixed chatwoot line wrap issue commit de676041df Merge: 1cd7291 82b1567 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:51:53 2023 -0300 Merge tag '1.4.3' into develop * Adjusts in settings with options always_online, read_messages and read_status * Fixed send webhook for event CALL * Create instance with settings commit 82b1567ae5 Merge: f95f312 1cd7291 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:51:42 2023 -0300 Merge branch 'release/1.4.3' commit 1cd7291068 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:51:28 2023 -0300 version: 1.4.3 commit fdee1df5b3 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:42:45 2023 -0300 fix: Create instance with settings commit c314d00ccd Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:42:34 2023 -0300 fix: Create instance with settings commit 62e2a8a6e3 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 10:23:18 2023 -0300 fix: Fixed send webhook for event CALL commit a12231a0aa Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Tue Jul 25 09:57:28 2023 -0300 fix: Adjusts in settings with options always_online, read_messages and read_status commit 183efd427a Merge: 4d9ca4b f95f312 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:52:58 2023 -0300 Merge tag '1.4.2' into develop * Fixed validation is set settings * Adjusts in group validations * Ajusts in sticker message to chatwoot commit f95f3126c3 Merge: cc91f2e 4d9ca4b Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:52:46 2023 -0300 Merge branch 'release/1.4.2' commit 4d9ca4b451 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:52:34 2023 -0300 version: 1.4.2 commit c76334a68a Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:32:29 2023 -0300 fix: Ajusts in sticker message to chatwoot commit f475391ba6 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:32:15 2023 -0300 fix: Ajusts in sticker message to chatwoot commit b77f22790b Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:13:18 2023 -0300 fix: Fixed validation is set settings commit 757a578c6e Merge: c582476 f8e1892 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:12:51 2023 -0300 Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop commit c5824767c8 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:11:49 2023 -0300 fix: Fixed validation is set settings commit 84f3f07279 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:11:15 2023 -0300 fix: Fixed validation is set settings commit f8e1892eee Merge: 036a8ed 58ed6f3 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:08:24 2023 -0300 fix: group validation Group validation commit 036a8edca0 Merge: 3d8e6f4 ef4be6a Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 20:07:05 2023 -0300 fix: Promote All Participants in Create Group Promote All Participants in Create Group commit 58ed6f395f Author: Alan Mosko <moskoweb@gmail.com> Date: Mon Jul 24 19:59:09 2023 -0300 Validação de Grupo commit ef4be6a612 Author: Alan Mosko <moskoweb@gmail.com> Date: Mon Jul 24 19:53:03 2023 -0300 Start commit 3d8e6f4394 Merge: 8b6e577 0cc1f18 Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 19:08:39 2023 -0300 fix: Fixed mentions Fixed mentions commit 0cc1f18a7e Author: Alan Mosko <moskoweb@gmail.com> Date: Mon Jul 24 19:05:32 2023 -0300 [BUG] Correção de mencionar Caso seja enviado everyOne como false sem passar nada no mentioned commit 8b6e577b8f Merge: f9abd90 cc91f2e Author: Davidson Gomes <davidsongviolao@gmail.com> Date: Mon Jul 24 18:28:57 2023 -0300 Merge tag '1.4.1' into develop * Fixed reconnect with pairing code or qrcode * Fixed problem in createJid
2025-12-20 20:32:23 -06:00 · 2023-07-26 10:59:15 -03:00
parent 249aecbc0d
commit 5482601b41
22 changed files with 6231 additions and 5699 deletions
--- a/src/whatsapp/controllers/instance.controller.ts
+++ b/src/whatsapp/controllers/instance.controller.ts
@@ -1,309 +1,376 @@
 import { delay } from '@whiskeysockets/baileys';
-import { isURL } from 'class-validator';
 import EventEmitter2 from 'eventemitter2';
-
-import { ConfigService, HttpServer } from '../../config/env.config';
-import { Logger } from '../../config/logger.config';
-import { RedisCache } from '../../db/redis.client';
+import { Auth, ConfigService, HttpServer } from '../../config/env.config';
 import { BadRequestException, InternalServerErrorException } from '../../exceptions';
 import { InstanceDto } from '../dto/instance.dto';
 import { RepositoryBroker } from '../repository/repository.manager';
 import { AuthService, OldToken } from '../services/auth.service';
-import { ChatwootService } from '../services/chatwoot.service';
 import { WAMonitoringService } from '../services/monitor.service';
-import { WebhookService } from '../services/webhook.service';
 import { WAStartupService } from '../services/whatsapp.service';
+import { WebhookService } from '../services/webhook.service';
+import { ChatwootService } from '../services/chatwoot.service';
+import { Logger } from '../../config/logger.config';
 import { wa } from '../types/wa.types';
+import { RedisCache } from '../../db/redis.client';
+import { isURL } from 'class-validator';
+import { SettingsService } from '../services/settings.service';

 export class InstanceController {
-    constructor(
-        private readonly waMonitor: WAMonitoringService,
-        private readonly configService: ConfigService,
-        private readonly repository: RepositoryBroker,
-        private readonly eventEmitter: EventEmitter2,
-        private readonly authService: AuthService,
-        private readonly webhookService: WebhookService,
-        private readonly chatwootService: ChatwootService,
-        private readonly cache: RedisCache,
-    ) {}
+  constructor(
+    private readonly waMonitor: WAMonitoringService,
+    private readonly configService: ConfigService,
+    private readonly repository: RepositoryBroker,
+    private readonly eventEmitter: EventEmitter2,
+    private readonly authService: AuthService,
+    private readonly webhookService: WebhookService,
+    private readonly chatwootService: ChatwootService,
+    private readonly settingsService: SettingsService,
+    private readonly cache: RedisCache,
+  ) {}

-    private readonly logger = new Logger(InstanceController.name);
+  private readonly logger = new Logger(InstanceController.name);

-    public async createInstance({
-        instanceName,
+  public async createInstance({
+    instanceName,
+    webhook,
+    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) {
+    try {
+      this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
+
+      if (instanceName !== instanceName.toLowerCase().replace(/[^a-z0-9]/g, '')) {
+        throw new BadRequestException(
+          'The instance name must be lowercase and without special characters',
+        );
+      }
+
+      this.logger.verbose('checking duplicate token');
+      await this.authService.checkDuplicateToken(token);
+
+      this.logger.verbose('creating instance');
+      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);
+        }
+      }
+
+      this.logger.verbose('creating settings');
+      const settings: wa.LocalSettings = {
+        reject_call: reject_call || false,
+        msg_call: msg_call || '',
+        groups_ignore: groups_ignore || false,
+        always_online: always_online || false,
+        read_messages: read_messages || false,
+        read_status: read_status || false,
+      };
+
+      this.logger.verbose('settings: ' + JSON.stringify(settings));
+
+      this.settingsService.create(instance, settings);
+
+      if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
+        let getQrcode: wa.QrCode;
+
+        if (qrcode) {
+          this.logger.verbose('creating qrcode');
+          await instance.connectToWhatsapp(number);
+          await delay(5000);
+          getQrcode = instance.qrCode;
+        }
+
+        const result = {
+          instance: {
+            instanceName: instance.instanceName,
+            status: 'created',
+          },
+          hash,
+          webhook,
+          webhook_by_events,
+          events: getEvents,
+          settings,
+          qrcode: getQrcode,
+        };
+
+        this.logger.verbose('instance created');
+        this.logger.verbose(result);
+
+        return result;
+      }
+
+      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');
+      }
+
+      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 {
+        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,
+          number,
+          reopen_conversation: chatwoot_reopen_conversation || false,
+          conversation_pending: chatwoot_conversation_pending || false,
+        });
+
+        this.chatwootService.initInstanceChatwoot(
+          instance,
+          instance.instanceName,
+          `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
+          qrcode,
+          number,
+        );
+      } catch (error) {
+        this.logger.log(error);
+      }
+
+      return {
+        instance: {
+          instanceName: instance.instanceName,
+          status: 'created',
+        },
+        hash,
        webhook,
        webhook_by_events,
-        events,
-        qrcode,
-        number,
-        token,
-        chatwoot_account_id,
-        chatwoot_token,
-        chatwoot_url,
-        chatwoot_sign_msg,
-    }: InstanceDto) {
-        this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
+        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) {
+      console.log(error);
+      return { error: true, message: error.toString() };
+    }
+  }

-        if (instanceName !== instanceName.toLowerCase().replace(/[^a-z0-9]/g, '')) {
-            throw new BadRequestException('The instance name must be lowercase and without special characters');
-        }
+  public async connectToWhatsapp({ instanceName, number = null }: InstanceDto) {
+    try {
+      this.logger.verbose(
+        'requested connectToWhatsapp from ' + instanceName + ' instance',
+      );

-        this.logger.verbose('checking duplicate token');
-        await this.authService.checkDuplicateToken(token);
+      const instance = this.waMonitor.waInstances[instanceName];
+      const state = instance?.connectionStatus?.state;

-        this.logger.verbose('creating instance');
-        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('state: ' + state);

-        this.logger.verbose('instance: ' + instance.instanceName + ' created');
+      if (state == 'open') {
+        return await this.connectionState({ instanceName });
+      }

-        this.waMonitor.waInstances[instance.instanceName] = instance;
-        this.waMonitor.delInstanceTime(instance.instanceName);
+      if (state == 'connecting') {
+        return instance.qrCode;
+      }

-        this.logger.verbose('generating hash');
-        const hash = await this.authService.generateHash(
-            {
-                instanceName: instance.instanceName,
-            },
-            token,
-        );
+      if (state == 'close') {
+        this.logger.verbose('connecting');
+        await instance.connectToWhatsapp(number);

-        this.logger.verbose('hash: ' + hash + ' generated');
+        await delay(5000);
+        return instance.qrCode;
+      }

-        let getEvents: string[];
+      return {
+        instance: {
+          instanceName: instanceName,
+          status: state,
+        },
+        qrcode: instance?.qrCode,
+      };
+    } catch (error) {
+      this.logger.error(error);
+    }
+  }

-        if (webhook) {
-            if (!isURL(webhook, { require_tld: false })) {
-                throw new BadRequestException('Invalid "url" property in webhook');
-            }
+  public async restartInstance({ instanceName }: InstanceDto) {
+    try {
+      this.logger.verbose('requested restartInstance from ' + instanceName + ' instance');

-            this.logger.verbose('creating webhook');
-            try {
-                this.webhookService.create(instance, {
-                    enabled: true,
-                    url: webhook,
-                    events,
-                    webhook_by_events,
-                });
+      this.logger.verbose('logging out instance: ' + instanceName);
+      this.waMonitor.waInstances[instanceName]?.client?.ws?.close();

-                getEvents = (await this.webhookService.find(instance)).events;
-            } catch (error) {
-                this.logger.log(error);
-            }
-        }
+      return { error: false, message: 'Instance restarted' };
+    } catch (error) {
+      this.logger.error(error);
+    }
+  }

-        if (!chatwoot_account_id || !chatwoot_token || !chatwoot_url) {
-            let getQrcode: wa.QrCode;
+  public async connectionState({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
+    return {
+      instance: {
+        instanceName: instanceName,
+        state: this.waMonitor.waInstances[instanceName]?.connectionStatus?.state,
+      },
+    };
+  }

-            if (qrcode) {
-                this.logger.verbose('creating qrcode');
-                await instance.connectToWhatsapp(number);
-                await delay(5000);
-                getQrcode = instance.qrCode;
-            }
-
-            const result = {
-                instance: {
-                    instanceName: instance.instanceName,
-                    status: 'created',
-                },
-                hash,
-                webhook,
-                webhook_by_events,
-                events: getEvents,
-                qrcode: getQrcode,
-            };
-
-            this.logger.verbose('instance created');
-            this.logger.verbose(result);
-
-            return result;
-        }
-
-        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,
-                number,
-            });
-
-            this.chatwootService.initInstanceChatwoot(
-                instance,
-                instance.instanceName,
-                `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
-                qrcode,
-                number,
-            );
-        } catch (error) {
-            this.logger.log(error);
-        }
-
-        return {
-            instance: {
-                instanceName: instance.instanceName,
-                status: 'created',
-            },
-            hash,
-            webhook,
-            webhook_by_events,
-            events: getEvents,
-            chatwoot: {
-                enabled: true,
-                account_id: chatwoot_account_id,
-                token: chatwoot_token,
-                url: chatwoot_url,
-                sign_msg: chatwoot_sign_msg || false,
-                number,
-                name_inbox: instance.instanceName,
-                webhook_url: `${urlServer}/chatwoot/webhook/${instance.instanceName}`,
-            },
-        };
+  public async fetchInstances({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
+    if (instanceName) {
+      this.logger.verbose('instanceName: ' + instanceName);
+      return this.waMonitor.instanceInfo(instanceName);
    }

-    public async connectToWhatsapp({ instanceName, number = null }: InstanceDto) {
-        try {
-            this.logger.verbose('requested connectToWhatsapp from ' + instanceName + ' instance');
+    return this.waMonitor.instanceInfo();
+  }

-            const instance = this.waMonitor.waInstances[instanceName];
-            const state = instance?.connectionStatus?.state;
+  public async logout({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested logout from ' + instanceName + ' instance');
+    const { instance } = await this.connectionState({ instanceName });

-            this.logger.verbose('state: ' + state);
-
-            if (state == 'open') {
-                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);
-        }
+    if (instance.state === 'close') {
+      throw new BadRequestException(
+        'The "' + instanceName + '" instance is not connected',
+      );
    }

-    public async restartInstance({ instanceName }: InstanceDto) {
-        try {
-            this.logger.verbose('requested restartInstance from ' + instanceName + ' instance');
+    try {
+      this.logger.verbose('logging out instance: ' + instanceName);
+      await this.waMonitor.waInstances[instanceName]?.client?.logout(
+        'Log out instance: ' + instanceName,
+      );

-            this.logger.verbose('logging out instance: ' + instanceName);
-            this.waMonitor.waInstances[instanceName]?.client?.ws?.close();
+      this.logger.verbose('close connection instance: ' + instanceName);
+      this.waMonitor.waInstances[instanceName]?.client?.ws?.close();

-            return { error: false, message: 'Instance restarted' };
-        } catch (error) {
-            this.logger.error(error);
-        }
+      return { error: false, message: 'Instance logged out' };
+    } catch (error) {
+      throw new InternalServerErrorException(error.toString());
    }
+  }

-    public async connectionState({ instanceName }: InstanceDto) {
-        this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
-        return {
-            instance: {
-                instanceName: instanceName,
-                state: this.waMonitor.waInstances[instanceName]?.connectionStatus?.state,
-            },
-        };
+  public async deleteInstance({ instanceName }: InstanceDto) {
+    this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
+    const { instance } = await this.connectionState({ instanceName });
+
+    if (instance.state === 'open') {
+      throw new BadRequestException(
+        'The "' + instanceName + '" instance needs to be disconnected',
+      );
    }
+    try {
+      if (instance.state === 'connecting') {
+        this.logger.verbose('logging out instance: ' + instanceName);

-    public async fetchInstances({ instanceName }: InstanceDto) {
-        this.logger.verbose('requested fetchInstances from ' + instanceName + ' instance');
-        if (instanceName) {
-            this.logger.verbose('instanceName: ' + instanceName);
-            return this.waMonitor.instanceInfo(instanceName);
-        }
+        await this.logout({ instanceName });
+        delete this.waMonitor.waInstances[instanceName];
+        return { error: false, message: 'Instance deleted' };
+      } else {
+        this.logger.verbose('deleting instance: ' + instanceName);

-        return this.waMonitor.instanceInfo();
+        delete this.waMonitor.waInstances[instanceName];
+        this.eventEmitter.emit('remove.instance', instanceName, 'inner');
+        return { error: false, message: 'Instance deleted' };
+      }
+    } catch (error) {
+      throw new BadRequestException(error.toString());
    }
+  }

-    public async logout({ instanceName }: InstanceDto) {
-        this.logger.verbose('requested logout from ' + instanceName + ' instance');
-        const { instance } = await this.connectionState({ instanceName });
-
-        if (instance.state === 'close') {
-            throw new BadRequestException('The "' + instanceName + '" instance is not connected');
-        }
-
-        try {
-            this.logger.verbose('logging out instance: ' + instanceName);
-            await this.waMonitor.waInstances[instanceName]?.client?.logout('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' };
-        } catch (error) {
-            throw new InternalServerErrorException(error.toString());
-        }
-    }
-
-    public async deleteInstance({ instanceName }: InstanceDto) {
-        this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
-        const { instance } = await this.connectionState({ instanceName });
-
-        if (instance.state === 'open') {
-            throw new BadRequestException('The "' + instanceName + '" instance needs to be disconnected');
-        }
-        try {
-            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' };
-            } 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' };
-            }
-        } catch (error) {
-            throw new BadRequestException(error.toString());
-        }
-    }
-
-    public async refreshToken(_: InstanceDto, oldToken: OldToken) {
-        this.logger.verbose('requested refreshToken');
-        return await this.authService.refreshToken(oldToken);
-    }
+  public async refreshToken(_: InstanceDto, oldToken: OldToken) {
+    this.logger.verbose('requested refreshToken');
+    return await this.authService.refreshToken(oldToken);
+  }
 }