validate connect session with another whatsapp number

Author: clairton

__tests__/services/client_baileys.ts

@@ -8,7 +8,6 @@ import { Store } from '../../src/services/store'
 import {
   connect,
   Status,
-  SendError,
   sendMessage,
   readMessages,
   rejectCall,
@@ -25,6 +24,7 @@ import { Incoming } from '../../src/services/incoming'
 import { dataStores } from '../../src/services/data_store'
 import logger from '../../src/services/logger'
 import { SessionStore } from '../../src/services/session_store'
+import { SendError } from '../../src/services/send_error'
 
 const mockConnect = connect as jest.MockedFunction<typeof connect>
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoapi-cloud",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "description": "Unoapi Cloud",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/locales/en.json

@@ -24,5 +24,6 @@
 	"pairing_code": "Open your WhatsApp and go to: Connected Devices > Connect a new Device > Connect using phone number > And put your connection code > %s",
   "restart": "Restarting session",
   "standby": "Standby session, waiting for time configured to try connect again, %s error in %s seconds",
-  "proxy_error": "Error on connect to proxy: %s"
+  "proxy_error": "Error on connect to proxy: %s",
+  "session_conflict": "The session number is %s but the configured number %s"
 }

src/locales/pt.json

@@ -24,5 +24,6 @@
 	"pairing_code": "Informe o código para conectar no whatsapp > %s",
   "restart": "Reiniciando sessão",
   "standby": "Sessão colocada em standby, esperando pelo tempo configurado para tentar conectar novamente: %s",
-  "proxy_error": "Erro ao conectar no proxy: %s"
+  "proxy_error": "Erro ao conectar no proxy: %s",
+  "session_conflict": "O número the sessão usado é o %s mas o número da configuração é %s"
 }

src/locales/pt_BR.json

@@ -24,5 +24,6 @@
 	"pairing_code": "Informe o código para conectar no whatsapp: %s",
   "restart": "Reiniciando sessão",
   "standby": "Sessão colocada em standby, esperando pelo tempo configurado para tentar conectar novamente: %s",
-  "proxy_error": "Erro ao conectar no proxy: %s"
+  "proxy_error": "Erro ao conectar no proxy: %s",
+  "session_conflict": "O número the sessão usado é o %s mas o número da configuração é %s"
 }

src/services/client_baileys.ts

@@ -4,7 +4,6 @@ import { Listener } from './listener'
 import { Store } from './store'
 import {
   connect,
-  SendError,
   sendMessage,
   readMessages,
   rejectCall,
@@ -29,6 +28,8 @@ import logger from './logger'
 import { FETCH_TIMEOUT_MS, VALIDATE_MEDIA_LINK_BEFORE_SEND } from '../defaults'
 import { t } from '../i18n'
 import { ClientForward } from './client_forward'
+import { SendError } from './send_error'
+
 const attempts = 3
 
 interface Delay {

src/services/send_error.ts

@@ -0,0 +1,9 @@
+export class SendError extends Error {
+  readonly code: number
+  readonly title: string
+  constructor(code: number, title: string) {
+    super(`${code}: ${title}`)
+    this.code = code
+    this.title = title
+  }
+}

src/services/socket.ts

@@ -17,14 +17,15 @@ import MAIN_LOGGER from 'baileys/lib/Utils/logger'
 import { Config, defaultConfig } from './config'
 import { Store } from './store'
 import NodeCache from 'node-cache'
-import { isIndividualJid, isValidPhoneNumber } from './transformer'
+import { isIndividualJid, isValidPhoneNumber, jidToPhoneNumber } from './transformer'
 import logger from './logger'
 import { Level } from 'pino'
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
 import { useVoiceCallsBaileys } from 'voice-calls-baileys/lib/services/transport.model'
 import { DEFAULT_BROWSER, WHATSAPP_VERSION, LOG_LEVEL, CONNECTING_TIMEOUT_MS, MAX_CONNECT_TIME, MAX_CONNECT_RETRY } from '../defaults'
 import { t } from '../i18n'
+import { SendError } from './send_error'
 
 const EVENTS = [
   'connection.update',
@@ -61,16 +62,6 @@ export type OnDisconnected = (phone: string, payload: any) => Promise<void>
 export type OnNewLogin = (phone: string) => Promise<void>
 export type OnReconnect = (time: number) => Promise<void>
 
-export class SendError extends Error {
-  readonly code: number
-  readonly title: string
-  constructor(code: number, title: string) {
-    super(`${code}: ${title}`)
-    this.code = code
-    this.title = title
-  }
-}
-
 export interface sendMessage {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (_phone: string, _message: AnyMessageContent, _options: unknown): Promise<any>
@@ -134,6 +125,25 @@ export const connect = async ({
   let sock: WASocket | undefined = undefined
   const msgRetryCounterCache = new NodeCache()
   const { dataStore, state, saveCreds, sessionStore } = store
+  const firstSaveCreds = async () => {
+    if (state?.creds?.me?.id) {
+      const phoneCreds = jidToPhoneNumber(state?.creds?.me?.id, '')
+      logger.info(`First save creds with number is ${phoneCreds} and configured number ${phone}`)
+      if (phoneCreds != phone) {
+        await logout()
+        currentSaveCreds = async () => {
+          const message =  t('session_conflict', phoneCreds, phone)
+          logger.error(message)
+          await onNotification(message, true)
+        }
+      } else {
+        logger.info(`Correct save creds with number is ${phoneCreds} and configured number ${phone}`)
+        currentSaveCreds = saveCreds
+      }
+    }
+  }
+  let currentSaveCreds = firstSaveCreds
+  const verifyAndSaveCreds = async () => currentSaveCreds()
   let connectingTimeout
 
   const status: Status = {
@@ -519,7 +529,7 @@ export const connect = async ({
     }
     if (sock) {
       dataStore.bind(sock.ev)
-      event('creds.update', saveCreds)
+      event('creds.update', verifyAndSaveCreds)
       logger.info('Connection type %s already creds %s', config.connectionType, sock?.authState?.creds?.registered)
       if (config.connectionType == 'pairing_code' && !sock?.authState?.creds?.registered) {
         logger.info(`Requesting pairing code ${phone}`)