Merge branch 'release/1.4.1'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.4.1 (2023-07-24 18:28)
+
+### Fixed
+
+* Fixed reconnect with pairing code or qrcode
+* Fixed problem in createJid
+
 # 1.4.0 (2023-07-24 17:03)
 
 ### Features

package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolution-api",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Rest api for communication with WhatsApp",
   "main": "./dist/src/main.js",
   "scripts": {

src/validate/validate.schema.ts

@@ -124,7 +124,6 @@ const optionsSchema: JSONSchema7 = {
 
 const numberDefinition: JSONSchema7Definition = {
   type: 'string',
-  // pattern: '^\\d+[\\.@\\w-]+',
   description: 'Invalid format',
 };
 
@@ -446,7 +445,6 @@ export const whatsappNumberSchema: JSONSchema7 = {
       uniqueItems: true,
       items: {
         type: 'string',
-        // pattern: '^\\d+',
         description: '"numbers" must be an array of numeric strings',
       },
     },

src/whatsapp/controllers/instance.controller.ts

@@ -107,7 +107,7 @@ export class InstanceController {
       if (qrcode) {
         this.logger.verbose('creating qrcode');
         await instance.connectToWhatsapp(number);
-        await delay(3000);
+        await delay(5000);
         getQrcode = instance.qrCode;
       }
 
@@ -214,7 +214,7 @@ export class InstanceController {
         this.logger.verbose('connecting');
         await instance.connectToWhatsapp(number);
 
-        await delay(2000);
+        await delay(5000);
         return instance.qrCode;
       }
 
@@ -245,7 +245,12 @@ export class InstanceController {
 
   public async connectionState({ instanceName }: InstanceDto) {
     this.logger.verbose('requested connectionState from ' + instanceName + ' instance');
-    return this.waMonitor.waInstances[instanceName]?.connectionStatus;
+    return {
+      instance: {
+        instanceName: instanceName,
+        state: this.waMonitor.waInstances[instanceName]?.connectionStatus?.state,
+      },
+    };
   }
 
   public async fetchInstances({ instanceName }: InstanceDto) {
@@ -260,9 +265,9 @@ export class InstanceController {
 
   public async logout({ instanceName }: InstanceDto) {
     this.logger.verbose('requested logout from ' + instanceName + ' instance');
-    const stateConn = await this.connectionState({ instanceName });
+    const { instance } = await this.connectionState({ instanceName });
 
-    if (stateConn.state === 'close') {
+    if (instance.state === 'close') {
       throw new BadRequestException(
         'The "' + instanceName + '" instance is not connected',
       );
@@ -285,15 +290,15 @@ export class InstanceController {
 
   public async deleteInstance({ instanceName }: InstanceDto) {
     this.logger.verbose('requested deleteInstance from ' + instanceName + ' instance');
-    const stateConn = await this.connectionState({ instanceName });
+    const { instance } = await this.connectionState({ instanceName });
 
-    if (stateConn.state === 'open') {
+    if (instance.state === 'open') {
       throw new BadRequestException(
         'The "' + instanceName + '" instance needs to be disconnected',
       );
     }
     try {
-      if (stateConn.state === 'connecting') {
+      if (instance.state === 'connecting') {
         this.logger.verbose('logging out instance: ' + instanceName);
 
         await this.logout({ instanceName });

src/whatsapp/services/whatsapp.service.ts

@@ -606,11 +606,14 @@ export class WAStartupService {
         color: { light: '#ffffff', dark: '#198754' },
       };
 
+      console.log(this.phoneNumber);
       if (this.phoneNumber) {
         await delay(2000);
         this.instance.qrcode.pairingCode = await this.client.requestPairingCode(
           this.phoneNumber,
         );
+      } else {
+        this.instance.qrcode.pairingCode = null;
       }
 
       this.logger.verbose('Generating QR code');
@@ -894,13 +897,6 @@ export class WAStartupService {
 
       this.phoneNumber = number;
 
-      // if (number) {
-      //   this.logger.verbose('creating pairing code');
-      //   await delay(5000);
-      //   this.phoneNumber = number;
-      //   this.instance.qrcode.pairingCode = await this.client.requestPairingCode(number);
-      // }
-
       return this.client;
     } catch (error) {
       this.logger.error(error);
@@ -1521,7 +1517,7 @@ export class WAStartupService {
       .split(/\:/)[0]
       .split('@')[0];
 
-    if (number.includes('-') && number.length >= 24) {
+    if (number.length >= 18) {
       this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
       number = number.replace(/[^\d-]/g, '');
       return `${number}@g.us`;