add: connection with code

jrCleber · jrCleber · commit afbe7270bfca · 2025-11-30T14:11:46.000-03:00
endpoint: `GET /instance/connect/:instanceName/code/:phoneNumber`
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,6 @@
     "source.fixAll.eslint": "explicit",
     "source.fixAll": "explicit"
   },
-  "postman.settings.dotenv-detection-notification-visibility": false
+  "postman.settings.dotenv-detection-notification-visibility": false,
+  "prisma.pinToPrisma6": true
 }
diff --git a/src/validate/router.validate.ts b/src/validate/router.validate.ts
@@ -99,7 +99,6 @@ export async function dataValidate<T>(args: DataValidate<T>) {
         message,
       };
     });
-    logger.error([...message]);
     throw new BadRequestException(...message);
   }
 
diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
@@ -49,13 +49,14 @@ import {
 import { InstanceDto } from '../dto/instance.dto';
 import { WAMonitoringService } from '../services/monitor.service';
 import { Logger } from '../../config/logger.config';
-import { Request } from 'express';
+import { Request, Response } from 'express';
 import { Repository } from '../../repository/repository.service';
 import { InstanceService, OldToken } from '../services/instance.service';
 import { WAStartupService } from '../services/whatsapp.service';
 import { isString } from 'class-validator';
 import { ProviderFiles } from '../../provider/sessions';
 import { Websocket } from '../../websocket/server';
+import { HttpStatus } from '../../app.module';
 
 export class InstanceController {
   constructor(
@@ -148,6 +149,64 @@ export class InstanceController {
     }
   }
 
+  public async connectToWhatsappWitchCode(
+    { instanceName, phoneNumber }: InstanceDto,
+    res: Response,
+  ) {
+    if (!phoneNumber) {
+      throw new BadRequestException('phoneNumber required');
+    }
+
+    const find = await this.repository.instance.findUnique({
+      where: { name: instanceName },
+    });
+
+    if (!find) {
+      throw new NotFoundException('Instance not found');
+    }
+
+    try {
+      let instance: WAStartupService;
+      instance = this.waMonitor.waInstances.get(instanceName);
+      const info = instance?.getInstance();
+      if (info?.status.state === 'open') {
+        throw new Error('Instance already connected');
+      }
+
+      const state = info?.status.state || 'close';
+
+      if (!instance || !info?.status || info?.status?.state === 'refused') {
+        instance = new WAStartupService(
+          this.configService,
+          this.eventEmitter,
+          this.repository,
+          this.providerFiles,
+          this.ws,
+        );
+        await instance.setInstanceName(instanceName);
+        this.waMonitor.addInstance(instanceName, instance);
+      }
+
+      switch (state) {
+        case 'close':
+          await instance.setPhoneNumber(phoneNumber);
+          await instance.connectToWhatsapp();
+          this.eventEmitter.once('code.connection', (data: { code: string }) => {
+            res.status(HttpStatus.OK).json(data);
+          });
+          break;
+        case 'connecting':
+          res.status(HttpStatus.OK).json(instance.qrCode);
+          break;
+        default:
+          res.status(HttpStatus.OK).json(info?.status || {});
+      }
+    } catch (error) {
+      this.logger.error(error);
+      throw new BadRequestException(error?.message);
+    }
+  }
+
   public async updateInstance(instance: InstanceDto) {
     try {
       const instanceData = await this.instanceService.updateInstance(instance);
diff --git a/src/whatsapp/dto/instance.dto.ts b/src/whatsapp/dto/instance.dto.ts
@@ -36,4 +36,5 @@ export class InstanceDto {
   instanceName: string;
   description?: string;
   externalAttributes?: any;
+  phoneNumber?: string;
 }
diff --git a/src/whatsapp/routers/instance.router.ts b/src/whatsapp/routers/instance.router.ts
@@ -65,6 +65,14 @@ export function InstanceRouter(
 
       res.status(HttpStatus.OK).json(response);
     })
+    .get(routerPath('connect') + '/code/:phoneNumber', async (req, res) => {
+      await dataValidate<InstanceDto>({
+        request: req,
+        schema: instanceNameSchema,
+        execute: (instance) =>
+          instanceController.connectToWhatsappWitchCode(instance, res),
+      });
+    })
     .get(routerPath('connectionState'), ...guards, async (req, res) => {
       const response = await dataValidate<InstanceDto>({
         request: req,
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
@@ -40,6 +40,7 @@
 import makeWASocket, {
   AnyMessageContent,
   BaileysEventMap,
+  Browsers,
   BufferedEventData,
   CacheStore,
   Chat,
@@ -148,6 +149,7 @@ import {
   constants,
   existsSync,
   readFileSync,
+  rmSync,
   unlinkSync,
   writeFileSync,
 } from 'fs';
@@ -162,7 +164,7 @@ type InstanceQrCode = {
 };
 
 type InstanceStateConnection = {
-  state: 'open' | 'close' | 'refused' | WAConnectionState;
+  state: 'refused' | WAConnectionState;
   statusReason?: number;
 };
 
@@ -194,6 +196,20 @@ export class WAStartupService {
   public client: WASocket;
   private authState: Partial<AuthState> = {};
   private authStateProvider: AuthStateProvider;
+  private phoneNumber: string;
+
+  public async setPhoneNumber(v: string) {
+    this.phoneNumber = v;
+    try {
+      if (this.configService.get<ProviderSession>('PROVIDER')?.ENABLED) {
+        await this.providerFiles.removeSession(this.instance.name);
+      } else {
+        rmSync(join(INSTANCE_DIR, this.instance.name));
+      }
+    } catch {
+      //
+    }
+  }
 
   public async setInstanceName(name: string) {
     const i = await this.repository.instance.findUnique({
@@ -399,14 +415,21 @@ export class WAStartupService {
         color: { light: qrCodeOptions.LIGHT_COLOR, dark: qrCodeOptions.DARK_COLOR },
       };
 
+      let code: string;
+
+      if (this.phoneNumber && !this.client?.authState?.creds?.registered) {
+        code = await this.client.requestPairingCode(this.phoneNumber);
+        this.eventEmitter.emit('code.connection', { code });
+      }
+
       qrcode.toDataURL(qr, optsQrcode, (error, base64) => {
         if (error) {
           this.logger.error('Qrcode generate failed:' + error.toString());
           return;
         }
 
         this.instanceQr.base64 = base64;
-        this.instanceQr.code = qr;
+        this.instanceQr.code = code ?? qr;
 
         this.ws.send(this.instance.name, 'qrcode.updated', { code: qr, base64 });
 
@@ -417,8 +440,15 @@ export class WAStartupService {
 
       qrcodeTerminal.generate(qr, { small: true }, (qrcode) =>
         this.logger.log(
-          `\n{ instance: ${this.instance.name}, qrcodeCount: ${this.instanceQr.count} }\n` +
-            qrcode,
+          `\n${JSON.stringify(
+            {
+              instanceName: this.instance.name,
+              qrCount: this.instanceQr.count,
+              code: this.instanceQr.code ?? code,
+            },
+            null,
+            2,
+          )}\n` + qrcode,
         ),
       );
     }
@@ -504,9 +534,7 @@ export class WAStartupService {
   }
 
   private async defineAuthState() {
-    const provider = this.configService.get<ProviderSession>('PROVIDER');
-
-    if (provider?.ENABLED) {
+    if (this.configService.get<ProviderSession>('PROVIDER')?.ENABLED) {
       return await this.authStateProvider.authStateProvider(this.instance.name);
     }
 
@@ -520,11 +548,17 @@ export class WAStartupService {
 
     const { version } = await fetchLatestBaileysVersionV2();
     const session = this.configService.get<ConfigSessionPhone>('CONFIG_SESSION_PHONE');
-    const browser: WABrowserDescription = [session.CLIENT, session.NAME, release()];
+    const browser: WABrowserDescription = !this.phoneNumber
+      ? [session.CLIENT, session.NAME, release()]
+      : Browsers.macOS('Chrome');
 
-    const { EXPIRATION_TIME } = this.configService.get<QrCode>('QRCODE');
+    let { EXPIRATION_TIME } = this.configService.get<QrCode>('QRCODE');
     const CONNECTION_TIMEOUT = this.configService.get<number>('CONNECTION_TIMEOUT');
 
+    if (this.phoneNumber) {
+      EXPIRATION_TIME = CONNECTION_TIMEOUT;
+    }
+
     const proxy = this.configService.get<EnvProxy>('PROXY');
     const agents = createProxyAgents(proxy?.WS, proxy?.FETCH);
 
@@ -1874,140 +1908,6 @@ export class WAStartupService {
     );
   }
 
-  public async buttonsMessage(data: SendButtonsDto) {
-    const generate = await (async () => {
-      if (data.buttonsMessage?.thumbnailUrl) {
-        return await this.prepareMediaMessage({
-          mediatype: 'image',
-          media: data.buttonsMessage.thumbnailUrl,
-        });
-      }
-    })();
-
-    const message: proto.IMessage = {
-      viewOnceMessageV2: {
-        message: {
-          messageContextInfo: {
-            deviceListMetadata: {},
-            deviceListMetadataVersion: 2,
-          },
-          interactiveMessage: {
-            body: {
-              text: (() => {
-                let t = '*' + data.buttonsMessage.title + '*';
-                if (data.buttonsMessage?.description) {
-                  t += '\n\n';
-                  t += data.buttonsMessage.description;
-                  t += '\n';
-                }
-                return t;
-              })(),
-            },
-            footer: {
-              text: data.buttonsMessage?.footer,
-            },
-            header: (() => {
-              if (generate?.message?.imageMessage) {
-                return {
-                  hasMediaAttachment: !!generate.message.imageMessage,
-                  imageMessage: generate.message.imageMessage,
-                };
-              }
-            })(),
-            nativeFlowMessage: {
-              buttons: data.buttonsMessage.buttons.map((value) => {
-                return {
-                  name: value.typeButton,
-                  buttonParamsJson: value.toJSONString(),
-                };
-              }),
-              messageParamsJson: JSON.stringify({
-                from: 'api',
-                templateId: ulid(Date.now()),
-              }),
-            },
-          },
-        },
-      },
-    };
-
-    return await this.sendMessageWithTyping(data.number, message, data?.options);
-  }
-
-  public async listButtons(data: SendListDto) {
-    const generate = await (async () => {
-      if (data.listMessage?.thumbnailUrl) {
-        return await this.prepareMediaMessage({
-          mediatype: 'image',
-          media: data.listMessage.thumbnailUrl,
-        });
-      }
-    })();
-
-    const message: proto.IMessage = {
-      viewOnceMessageV2: {
-        message: {
-          messageContextInfo: {
-            deviceListMetadata: {},
-            deviceListMetadataVersion: 2,
-          },
-          interactiveMessage: {
-            body: {
-              text: (() => {
-                let t = '*' + data.listMessage.title + '*';
-                if (data.listMessage?.description) {
-                  t += '\n\n';
-                  t += data.listMessage.description;
-                  t += '\n';
-                }
-                return t;
-              })(),
-            },
-            footer: {
-              text: data.listMessage?.footer,
-            },
-            header: (() => {
-              if (generate?.message?.imageMessage) {
-                return {
-                  hasMediaAttachment: !!generate.message.imageMessage,
-                  imageMessage: generate.message.imageMessage,
-                };
-              }
-            })(),
-            nativeFlowMessage: {
-              buttons: data.listMessage.sections.map((value) => {
-                return {
-                  name: 'single_select',
-                  buttonParamsJson: value.toSectionsString(),
-                };
-              }),
-            },
-          },
-        },
-      },
-    };
-
-    return await this.sendMessageWithTyping(data.number, message, data?.options);
-  }
-
-  public async listLegacy(data: SendListLegacyDto) {
-    const msg = data.listMessage;
-    return await this.sendMessageWithTyping(data.number, {
-      viewOnceMessageV2: {
-        message: {
-          listMessage: {
-            title: msg.title,
-            description: msg?.description,
-            footerText: msg?.footer,
-            buttonText: msg.buttonText,
-            sections: msg.sections,
-            listType: proto.Message.ListMessage.ListType.SINGLE_SELECT,
-          },
-        },
-      },
-    });
-  }
-
   public async linkMessage(data: SendLinkDto) {
     return await this.sendMessageWithTyping(data.number, {
       extendedTextMessage: {

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`"source.fixAll.eslint": "explicit",`
`9`	`9`	`"source.fixAll": "explicit"`
`10`	`10`	`},`
`11`		`- "postman.settings.dotenv-detection-notification-visibility": false`
	`11`	`+ "postman.settings.dotenv-detection-notification-visibility": false,`
	`12`	`+ "prisma.pinToPrisma6": true`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ export async function dataValidate<T>(args: DataValidate<T>) {`
`99`	`99`	`message,`
`100`	`100`	`};`
`101`	`101`	`});`
`102`		`- logger.error([...message]);`
`103`	`102`	`throw new BadRequestException(...message);`
`104`	`103`	`}`
`105`	`104`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,5 @@ export class InstanceDto {`
`36`	`36`	`instanceName: string;`
`37`	`37`	`description?: string;`
`38`	`38`	`externalAttributes?: any;`
	`39`	`+ phoneNumber?: string;`
`39`	`40`	`}`