fix: display qrcode - count=0

Author: jrCleber

src/validate/router.validate.ts

@@ -67,7 +67,7 @@ export async function dataValidate<T>(args: DataValidate<T>) {
   const body = request.body ?? {};
   const instance = request.params as unknown as InstanceDto;
 
-  const isNotEmptyQuery = request?.query && Object.keys(request.query).length > 0;
+  const isNotEmptyQuery = Object.keys(request?.query ?? {}).length > 0;
 
   if (isNotEmptyQuery) {
     Object.assign(instance, request.query);

src/whatsapp/controllers/instance.controller.ts

@@ -102,7 +102,7 @@ export class InstanceController {
     }
   }
 
-  public async connectToWhatsapp({ instanceName }: InstanceDto) {
+  public async connectToWhatsapp({ instanceName }: InstanceDto, res: Response) {
     const find = await this.repository.instance.findUnique({
       where: { name: instanceName },
     });
@@ -136,12 +136,15 @@ export class InstanceController {
       switch (state) {
         case 'close':
           await instance.connectToWhatsapp();
-          await delay(3000);
-          return instance.qrCode;
+          this.eventEmitter.once('qrcode.updated', (data: { code: string }) => {
+            res.status(HttpStatus.OK).json({ code: data?.code });
+          });
+          break;
         case 'connecting':
-          return instance.qrCode;
+          res.status(HttpStatus.OK).json(instance.qrCode);
+          break;
         default:
-          return info?.status;
+          res.status(HttpStatus.OK).json(info?.status);
       }
     } catch (error) {
       this.logger.error(error);
@@ -191,12 +194,12 @@ export class InstanceController {
         case 'close':
           await instance.setPhoneNumber(phoneNumber);
           await instance.connectToWhatsapp();
-          this.eventEmitter.once('qrcode.updated', (data: { code: string }) => {
-            res.status(HttpStatus.OK).json({ code: data?.code });
+          this.eventEmitter.once('qrcode.updated', (data: { paringCode: string }) => {
+            res.status(HttpStatus.OK).json({ code: data?.paringCode });
           });
           break;
         case 'connecting':
-          res.status(HttpStatus.OK).json(instance.qrCode);
+          res.status(HttpStatus.OK).json({ code: instance.qrCode?.paringCode });
           break;
         default:
           res.status(HttpStatus.OK).json(info?.status || {});

src/whatsapp/routers/instance.router.ts

@@ -57,13 +57,11 @@ export function InstanceRouter(
       res.status(HttpStatus.CREATED).json(response);
     })
     .get(routerPath('connect'), ...guards, async (req, res) => {
-      const response = await dataValidate<InstanceDto>({
+      await dataValidate<InstanceDto>({
         request: req,
         schema: instanceNameSchema,
-        execute: (instance) => instanceController.connectToWhatsapp(instance),
+        execute: (instance) => instanceController.connectToWhatsapp(instance, res),
       });
-
-      res.status(HttpStatus.OK).json(response);
     })
     .get(routerPath('connect') + '/code/:phoneNumber', async (req, res) => {
       await dataValidate<InstanceDto>({

src/whatsapp/services/whatsapp.service.ts

@@ -340,7 +340,7 @@ export class WAStartupService {
       }
     } catch (error) {
       const axiosError = error as AxiosError;
-      const records = this.logger.error('sendDataWebhook-local', {
+      this.logger.error('sendDataWebhook-local', {
         message: axiosError?.message,
         hostName: error?.hostname,
         code: axiosError?.code,
@@ -366,7 +366,7 @@ export class WAStartupService {
       }
     } catch (error) {
       const axiosError = error as AxiosError;
-      const records = this.logger.error('sendDataWebhook-global', {
+      this.logger.error('sendDataWebhook-global', {
         message: axiosError?.message,
         hostName: error?.hostname,
         code: axiosError?.code,
@@ -435,25 +435,21 @@ export class WAStartupService {
         this.instanceQr.code = qr;
         this.instanceQr.base64 = base64;
 
-        this.ws.send(this.instance.name, 'qrcode.updated', this.instanceQr);
+        this.ws.send(this.instance.name, 'qrcode.updated', { ...this.instanceQr });
 
         this.sendDataWebhook('qrcodeUpdated', {
           qrcode: { instance: this.instance.name, ...this.instanceQr },
         });
+
+        this.eventEmitter.emit('qrcode.updated', { ...this.instanceQr });
       });
 
       if (process.env.NODE_ENV === 'development') {
         qrcodeTerminal.generate(qr, { small: true }, (display) => {
-          this.logger.info(
-            `\n${JSON.stringify(
-              {
-                instanceName: this.instance.name,
-                ...this.instanceQr,
-              },
-              null,
-              2,
-            )}`,
-          );
+          this.logger.info(`qrcode[${this.instanceName}]`, {
+            count: this.instanceQr.count,
+            paringCode: this.instanceQr?.paringCode,
+          });
           console.log(display);
         });
       }