@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Socket/socket.js

@@ -2,17 +2,62 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const boom_1 = require("@hapi/boom")
-const crypto_1 = require("crypto")
-const url_1 = require("url")
-const util_1 = require("util")
-const WAProto_1 = require("../../WAProto")
-const Defaults_1 = require("../Defaults")
-const Types_1 = require("../Types")
-const Utils_1 = require("../Utils")
-const WABinary_1 = require("../WABinary")
-const Client_1 = require("./Client")
-const WAUSync_1 = require("../WAUSync")
+const { Boom } = require("@hapi/boom")
+const { randomBytes } = require("crypto")
+const { URL } = require("url")
+const { promisify } = require("util")
+const { proto } = require("../../WAProto")
+const {
+  DEF_TAG_PREFIX, 
+  DEF_CALLBACK_PREFIX
+} = require("../Defaults/prefix")
+const {
+  NOISE_WA_HEADER, 
+  INITIAL_PREKEY_COUNT, 
+  MIN_UPLOAD_INTERVAL, 
+  MIN_PREKEY_COUNT, 
+  UPLOAD_TIMEOUT
+} = require("../Defaults/constants")
+const { DisconnectReason } = require("../Types")
+const { 
+  addTransactionCapability, 
+  aesEncryptCTR, 
+  printQRIfNecessaryListener, 
+  bindWaitForConnectionUpdate, 
+  bytesToCrockford, 
+  configureSuccessfulPairing, 
+  Curve, 
+  derivePairingCodeKey, 
+  generateLoginNode, 
+  generateMdTagPrefix, 
+  generateRegistrationNode, 
+  getCodeFromWSError, 
+  getErrorCodeFromStreamError, 
+  getNextPreKeysNode,
+  getPlatformId, 
+  makeEventBuffer, 
+  makeNoiseHandler, 
+  promiseTimeout, 
+  asciiDecode
+} = require("../Utils")
+const { 
+  assertNodeErrorFree, 
+  binaryNodeToString, 
+  encodeBinaryNode, 
+  getBinaryNodeChild, 
+  getBinaryNodeChildren, 
+  getAllBinaryNodeChildren, 
+  isLidUser,
+  jidDecode,
+  jidEncode, 
+  S_WHATSAPP_NET
+} = require("../WABinary")
+const { BinaryInfo } = require("../WAM") 
+const {
+  USyncUser, 
+  USyncQuery
+} = require("../WAUSync")
+const { WebSocketClient } = require("./Client")
 
 /**
  * Connects to WA servers and performs:
@@ -21,21 +66,80 @@ const WAUSync_1 = require("../WAUSync")
  * - query phone connection
  */
 const makeSocket = (config) => {
-    const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository } = config
+    const { 
+        waWebSocketUrl, 
+        connectTimeoutMs, 
+        logger, 
+        keepAliveIntervalMs, 
+        browser, 
+        auth: authState, 
+        printQRInTerminal, 
+        defaultQueryTimeoutMs, 
+        transactionOpts,
+        qrTimeout, 
+        makeSignalRepository 
+    } = config
     
-    const uqTagId = Utils_1.generateMdTagPrefix()
+    const uqTagId = generateMdTagPrefix()
     const generateMessageTag = () => `${uqTagId}${epoch++}`
-    
-    const url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl
+    const publicWAMBuffer = new BinaryInfo()
+    const url = typeof waWebSocketUrl === 'string' ? new URL(waWebSocketUrl) : waWebSocketUrl
     
     if (config.mobile || url.protocol === 'tcp:') {
-        throw new boom_1.Boom('Mobile API is not supported anymore', { statusCode: Types_1.DisconnectReason.loggedOut })
+        throw new Boom('Mobile API is not supported anymore', { statusCode: DisconnectReason.loggedOut })
     }
     
     if (url.protocol === 'wss' && authState?.creds?.routingInfo) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'))
     }
     
+   /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
+    const ephemeralKeyPair = Curve.generateKeyPair()
+    
+    /** WA noise protocol wrapper */
+    const noise = makeNoiseHandler({
+        keyPair: ephemeralKeyPair,
+        NOISE_HEADER: NOISE_WA_HEADER,
+        logger,
+        routingInfo: authState?.creds?.routingInfo
+    })
+    
+    const ws = new WebSocketClient(url, config)
+    
+    ws.connect()
+    
+    const sendPromise = promisify(ws.send)
+    
+    /** send a raw buffer */
+    const sendRawMessage = async (data) => {
+        if (!ws.isOpen) {
+            throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed })
+        }
+        
+        const bytes = noise.encodeFrame(data)
+        
+        await promiseTimeout(connectTimeoutMs, async (resolve, reject) => {
+            try {
+                await sendPromise.call(ws, bytes)
+                resolve()
+            }
+            catch (error) {
+                reject(error)
+            }
+        })
+    }
+    
+    /** send a binary node */
+    const sendNode = (frame) => {
+        if (logger.level === 'trace') {
+            logger.trace({ xml: binaryNodeToString(frame), msg: 'xml send' })
+        }
+        
+        const buff = encodeBinaryNode(frame)
+        
+        return sendRawMessage(buff)
+    }
+    
     /**
      * Wait for a message with a certain tag to be received
      * @param msgId the message tag to await
@@ -44,22 +148,47 @@ const makeSocket = (config) => {
     const waitForMessage = async (msgId, timeoutMs = defaultQueryTimeoutMs) => {
         let onRecv
         let onErr
+        
         try {
-            return await Utils_1.promiseTimeout(timeoutMs, (resolve, reject) => {
-                onRecv = resolve
+            const result = await promiseTimeout(timeoutMs, (resolve, reject) => {
+                onRecv = data => {
+                    resolve(data)
+                }
+                
                 onErr = err => {
-                    reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }))
+                    reject(err ||
+                        new Boom('Connection Closed', {
+                            statusCode: DisconnectReason.connectionClosed
+                        }))
                 }
+                
                 ws.on(`TAG:${msgId}`, onRecv)
-                ws.on('close', onErr) // if the socket closes, you'll never receive the message
-                ws.off('error', onErr)
+                ws.on('close', onErr)
+                ws.on('error', onErr)
+                
+                return () => reject(new Boom('Query Cancelled'))
             })
+            
+            return result
+        }
+        
+        catch (error) {
+            // Catch timeout and return undefined instead of throwing
+            if (error instanceof Boom && error.output?.statusCode === DisconnectReason.timedOut) {
+                logger?.warn?.({ msgId }, 'timed out waiting for message')
+                return undefined
+            }
+            
+            throw error
         }
         
         finally {
-            ws.off(`TAG:${msgId}`, onRecv)
-            ws.off('close', onErr) // if the socket closes, you'll never receive the message
-            ws.off('error', onErr)
+            if (onRecv)
+                ws.off(`TAG:${msgId}`, onRecv)
+            if (onErr) {
+                ws.off('close', onErr)
+                ws.off('error', onErr)
+            }
         }
     }
    
@@ -70,22 +199,60 @@ const makeSocket = (config) => {
         }
         
         const msgId = node.attrs.id
-        const wait = waitForMessage(msgId, timeoutMs) 
+        const result = await promiseTimeout(timeoutMs, async (resolve, reject) => {
+            const result = waitForMessage(msgId, timeoutMs).catch(reject)
+            sendNode(node)
+                .then(async () => resolve(await result))
+                .catch(reject)
+        })
         
-        await sendNode(node)
+        if (result && 'tag' in result) {
+            assertNodeErrorFree(result)
+        }
+        
+        return result
+    }
+    
+    // Validate current key-bundle on server; on failure, trigger pre-key upload and rethrow
+    const digestKeyBundle = async () => {
+        const res = await query({
+            tag: 'iq',
+            attrs: { to: S_WHATSAPP_NET, type: 'get', xmlns: 'encrypt' },
+            content: [{ tag: 'digest', attrs: {} }]
+        })
         
-        const result = await wait
+        const digestNode = getBinaryNodeChild(res, 'digest')
         
-        if ('tag' in result) {
-            WABinary_1.assertNodeErrorFree(result)
+        if (!digestNode) {
+            await uploadPreKeys()
+            throw new Error('encrypt/get digest returned no digest node')
         }
+    }
+    
+    // Rotate our signed pre-key on server; on failure, run digest as fallback and rethrow
+    const rotateSignedPreKey = async () => {
+        const newId = (creds.signedPreKey.keyId || 0) + 1
+        const skey = await signedKeyPair(creds.signedIdentityKey, newId)
         
-        return result
+        await query({
+            tag: 'iq',
+            attrs: { to: S_WHATSAPP_NET, type: 'set', xmlns: 'encrypt' },
+            content: [
+                {
+                    tag: 'rotate',
+                    attrs: {},
+                    content: [xmppSignedPreKey(skey)]
+                }
+            ]
+        })
+        
+        // Persist new signed pre-key in creds
+        ev.emit('creds.update', { signedPreKey: skey })
     }
     
     const executeUSyncQuery = async (usyncQuery) => {
         if (usyncQuery.protocols.length === 0) {
-            throw new boom_1.Boom('USyncQuery must have at least one protocol');
+            throw new Boom('USyncQuery must have at least one protocol')
         }
         
         // todo: validate users, throw WARNING on no valid users
@@ -116,7 +283,7 @@ const makeSocket = (config) => {
         const iq = {
             tag: 'iq',
             attrs: {
-                to: WABinary_1._WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'usync'
             },
@@ -136,53 +303,74 @@ const makeSocket = (config) => {
         }
         
         const result = await query(iq)
+        
         return usyncQuery.parseUSyncQueryResult(result)
     }
     
-    const onWhatsApp = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withLIDProtocol().withContactProtocol()
-        for (const jid of jids) {
-            if (WABinary_1.isLidUser(jid)) {
-                usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid)) // intentional
+    const onWhatsApp = async (...phoneNumber) => {
+        let usyncQuery = new USyncQuery()
+        let contactEnabled = false
+        
+        for (const jid of phoneNumber) {
+            if (isLidUser(jid)) {
+                logger?.warn('LIDs are not supported with onWhatsApp')
+                continue
             }
+            
             else {
+                if (!contactEnabled) {
+                    contactEnabled = true
+                    usyncQuery = usyncQuery.withContactProtocol()
+                }
+                
                 const phone = `+${jid.replace('+', '').split('@')[0]?.split(':')[0]}`
-                usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone))
+                usyncQuery.withUser(new USyncUser().withPhone(phone))
             }
         }
+        
+        if (usyncQuery.users.length === 0) {
+            return [] // return early without forcing an empty query
+        }
+        
         const results = await executeUSyncQuery(usyncQuery)
+        
         if (results) {
-            if (results.list.filter(a => !!a.lid).length > 0) {
-                const lidOnly = results.list.filter(a => !!a.lid)
-                await signalRepository.lidMapping.storeLIDPNMappings(lidOnly.map(a => ({ pn: a.id, lid: a.lid })))
-            }
-            return results.list
-                .filter(a => !!a.contact)
-                .map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid: lid }))
+            return results.list.filter(a => !!a.contact).map(({ contact, id }) => ({ jid: id, exists: contact }))
         }
     }
     
-    const ws = new Client_1.WebSocketClient(url, config)
-    
-    ws.connect()
-    const ev = Utils_1.makeEventBuffer(logger)
-    
-    /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
-    const ephemeralKeyPair = Utils_1.Curve.generateKeyPair()
-    
-    /** WA noise protocol wrapper */
-    const noise = Utils_1.makeNoiseHandler({
-        keyPair: ephemeralKeyPair,
-        NOISE_HEADER: Defaults_1.NOISE_WA_HEADER,
-        logger,
-        routingInfo: authState?.creds?.routingInfo
-    })
+    const pnFromLIDUSync = async (jids) => {
+        const usyncQuery = new USyncQuery().withLIDProtocol().withContext('background')
+        for (const jid of jids) {
+            if (isLidUser(jid)) {
+                logger?.warn('LID user found in LID fetch call')
+                continue
+            }
+            
+            else {
+                usyncQuery.withUser(new USyncUser().withId(jid))
+            }
+        }
+        
+        if (usyncQuery.users.length === 0) {
+            return [] // return early without forcing an empty query
+        }
+        
+        const results = await executeUSyncQuery(usyncQuery)
+        
+        if (results) {
+            return results.list.filter(a => !!a.lid).map(({ lid, id }) => ({ pn: id, lid: lid }))
+        }
+        
+        return []
+    }
     
+    const ev = makeEventBuffer(logger)
     const { creds } = authState
     
     // add transaction capability
-    const keys = Utils_1.addTransactionCapability(authState.keys, logger, transactionOpts)
-    const signalRepository = makeSignalRepository({ creds, keys }, onWhatsApp, logger)
+    const keys = addTransactionCapability(authState.keys, logger, transactionOpts)
+    const signalRepository = makeSignalRepository({ creds, keys }, logger, pnFromLIDUSync)
     
     let lastDateRecv
     let epoch = 1
@@ -190,37 +378,6 @@ const makeSocket = (config) => {
     let qrTimer
     let closed = false
     
-    const sendPromise = util_1.promisify(ws.send)
-    
-    /** send a raw buffer */
-    const sendRawMessage = async (data) => {
-        if (!ws.isOpen) {
-            throw new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed })
-        }
-        
-        const bytes = noise.encodeFrame(data)
-        await Utils_1.promiseTimeout(connectTimeoutMs, async (resolve, reject) => {
-            try {
-                await sendPromise.call(ws, bytes)
-                resolve()
-            }
-            catch (error) {
-                reject(error)
-            }
-        })
-    }
-    
-    /** send a binary node */
-    const sendNode = (frame) => {
-        if (logger.level === 'trace') {
-            logger.trace({ xml: WABinary_1.binaryNodeToString(frame), msg: 'xml send' })
-        }
-        
-        const buff = WABinary_1.encodeBinaryNode(frame)
-        
-        return sendRawMessage(buff)
-    }
-    
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`)
@@ -229,17 +386,18 @@ const makeSocket = (config) => {
     /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
         if (!ws.isOpen) {
-            throw new boom_1.Boom('Connection Closed', {
-                statusCode: Types_1.DisconnectReason.connectionClosed
+            throw new Boom('Connection Closed', {
+                statusCode: DisconnectReason.connectionClosed
             })
         }
         
         let onOpen
         let onClose
         
-        const result = Utils_1.promiseTimeout(connectTimeoutMs, (resolve, reject) => {
+        const result = promiseTimeout(connectTimeoutMs, (resolve, reject) => {
             onOpen = resolve
             onClose = mapWebSocketError(reject)
+            
             ws.on('frame', onOpen)
             ws.on('close', onClose)
             ws.on('error', onClose)
@@ -262,36 +420,41 @@ const makeSocket = (config) => {
             clientHello: { ephemeral: ephemeralKeyPair.public }
         }
         
-        helloMsg = WAProto_1.proto.HandshakeMessage.fromObject(helloMsg)
+        helloMsg = proto.HandshakeMessage.fromObject(helloMsg)
+        
         logger.info({ browser, helloMsg }, 'connected to WA')
         
-        const init = WAProto_1.proto.HandshakeMessage.encode(helloMsg).finish()
+        const init = proto.HandshakeMessage.encode(helloMsg).finish()
         const result = await awaitNextMessage(init)
-        const handshake = WAProto_1.proto.HandshakeMessage.decode(result)
+        const handshake = proto.HandshakeMessage.decode(result)
         
         logger.trace({ handshake }, 'handshake recv from WA')
         
         const keyEnc = await noise.processHandshake(handshake, creds.noiseKey)
+        
         let node
         
         if (!creds.me) {
-            node = Utils_1.generateRegistrationNode(creds, config)
+            node = generateRegistrationNode(creds, config)
             logger.info({ node }, 'not logged in, attempting registration...')
         }
         
         else {
-            node = Utils_1.generateLoginNode(creds.me.id, config)
+            node = generateLoginNode(creds.me.id, config)
             logger.info({ node }, 'logging in...')
         }
-        const payloadEnc = noise.encrypt(WAProto_1.proto.ClientPayload.encode(node).finish())
         
-        await sendRawMessage(WAProto_1.proto.HandshakeMessage.encode({
+        const payloadEnc = noise.encrypt(proto.ClientPayload.encode(node).finish())
+        
+        await sendRawMessage(proto.HandshakeMessage.encode({
             clientFinish: {
                 static: keyEnc,
-                payload: payloadEnc,
-            },
+                payload: payloadEnc
+            }
         }).finish())
-        noise.finishInit()
+        
+        await noise.finishInit()
+        
         startKeepAliveRequest()
     }
     
@@ -302,14 +465,14 @@ const makeSocket = (config) => {
                 id: generateMessageTag(),
                 xmlns: 'encrypt',
                 type: 'get',
-                to: WABinary_1.S_WHATSAPP_NET
+                to: S_WHATSAPP_NET
             },
             content: [
                 { tag: 'count', attrs: {} }
             ]
         })
         
-        const countChild = WABinary_1.getBinaryNodeChild(result, 'count')
+        const countChild = getBinaryNodeChild(result, 'count')
         
         return +countChild.attrs.value
     }
@@ -319,11 +482,12 @@ const makeSocket = (config) => {
     let lastUploadTime = 0
     
     /** generates and uploads a set of pre-keys to the server */
-    const uploadPreKeys = async (count = Defaults_1.INITIAL_PREKEY_COUNT, retryCount = 0) => {
+    const uploadPreKeys = async (count = MIN_PREKEY_COUNT, retryCount = 0) => {
         // Check minimum interval (except for retries)
         if (retryCount === 0) {
             const timeSinceLastUpload = Date.now() - lastUploadTime
-            if (timeSinceLastUpload < Defaults_1.MIN_UPLOAD_INTERVAL) {
+            
+            if (timeSinceLastUpload < MIN_UPLOAD_INTERVAL) {
                 logger.debug(`Skipping upload, only ${timeSinceLastUpload}ms since last upload`)
                 return
             }
@@ -332,7 +496,7 @@ const makeSocket = (config) => {
         // Prevent multiple concurrent uploads
         if (uploadPreKeysPromise) {
             logger.debug('Pre-key upload already in progress, waiting for completion')
-            return uploadPreKeysPromise
+            await uploadPreKeysPromise
         }
         
         const uploadLogic = async () => {
@@ -341,7 +505,8 @@ const makeSocket = (config) => {
             // Generate and save pre-keys atomically (prevents ID collisions on retry)
             const node = await keys.transaction(async () => {
                 logger.debug({ requestedCount: count }, 'generating pre-keys with requested count')
-                const { update, node } = await Utils_1.getNextPreKeysNode({ creds, keys }, count)
+                
+                const { update, node } = await getNextPreKeysNode({ creds, keys }, count)
                 
                 // Update credentials immediately to prevent duplicate IDs on retry
                 ev.emit('creds.update', update)
@@ -355,15 +520,21 @@ const makeSocket = (config) => {
                 logger.info({ count }, 'uploaded pre-keys successfully')
                 lastUploadTime = Date.now()
             }
+            
             catch (uploadError) {
-                logger.error({ uploadError, count }, 'Failed to upload pre-keys to server')
+                logger.error({ uploadError: uploadError.toString(), count }, 'Failed to upload pre-keys to server')
+                
                 // Exponential backoff retry (max 3 retries)
                 if (retryCount < 3) {
                     const backoffDelay = Math.min(1000 * Math.pow(2, retryCount), 10000)
+                    
                     logger.info(`Retrying pre-key upload in ${backoffDelay}ms`)
+                    
                     await new Promise(resolve => setTimeout(resolve, backoffDelay))
+                    
                     return uploadPreKeys(count, retryCount + 1)
                 }
+                
                 throw uploadError
             }
         }
@@ -371,11 +542,13 @@ const makeSocket = (config) => {
         // Add timeout protection
         uploadPreKeysPromise = Promise.race([
             uploadLogic(),
-            new Promise((_, reject) => setTimeout(() => reject(new boom_1.Boom('Pre-key upload timeout', { statusCode: 408 })), Defaults_1.UPLOAD_TIMEOUT))
+            new Promise((_, reject) => setTimeout(() => reject(new Boom('Pre-key upload timeout', { statusCode: 408 })), UPLOAD_TIMEOUT))
         ])
+        
         try {
             await uploadPreKeysPromise
         }
+        
         finally {
             uploadPreKeysPromise = null
         }
@@ -383,50 +556,69 @@ const makeSocket = (config) => {
     
     const verifyCurrentPreKeyExists = async () => {
         const currentPreKeyId = creds.nextPreKeyId - 1
+        
         if (currentPreKeyId <= 0) {
             return { exists: false, currentPreKeyId: 0 }
         }
+        
         const preKeys = await keys.get('pre-key', [currentPreKeyId.toString()])
         const exists = !!preKeys[currentPreKeyId.toString()]
+        
         return { exists, currentPreKeyId }
     }
     
     const uploadPreKeysToServerIfRequired = async () => {
         try {
+            let count = 0
+            
             const preKeyCount = await getAvailablePreKeysOnServer()
+            
+            if (preKeyCount === 0)
+                count = INITIAL_PREKEY_COUNT
+            else
+                count = MIN_PREKEY_COUNT
+            
             const { exists: currentPreKeyExists, currentPreKeyId } = await verifyCurrentPreKeyExists()
             
             logger.info(`${preKeyCount} pre-keys found on server`)
             logger.info(`Current prekey ID: ${currentPreKeyId}, exists in storage: ${currentPreKeyExists}`)
             
-            const lowServerCount = preKeyCount <= Defaults_1.MIN_PREKEY_COUNT
+            const lowServerCount = preKeyCount <= count
             const missingCurrentPreKey = !currentPreKeyExists && currentPreKeyId > 0
             const shouldUpload = lowServerCount || missingCurrentPreKey
             
             if (shouldUpload) {
                 const reasons = []
+                
                 if (lowServerCount)
                     reasons.push(`server count low (${preKeyCount})`)
+                    
                 if (missingCurrentPreKey)
                     reasons.push(`current prekey ${currentPreKeyId} missing from storage`)
+                    
                 logger.info(`Uploading PreKeys due to: ${reasons.join(', ')}`)
-                await uploadPreKeys()
+                
+                await uploadPreKeys(count)
             }
+            
             else {
                 logger.info(`PreKey validation passed - Server: ${preKeyCount}, Current prekey ${currentPreKeyId} exists`)
             }
         }
+        
         catch (error) {
             logger.error({ error }, 'Failed to check/upload pre-keys during initialization')
             // Don't throw - allow connection to continue even if pre-key check fails
         }
     }
     
-    const onMessageReceived = (data) => {
-        noise.decodeFrame(data, frame => {
+    const onMessageReceived = async (data) => {
+        await noise.decodeFrame(data, frame => {
             // reset ping timeout
             lastDateRecv = new Date()
+            
             let anyTriggered = false
+            
             anyTriggered = ws.emit('frame', frame)
             
             // if it's a binary node
@@ -434,11 +626,11 @@ const makeSocket = (config) => {
                 const msgId = frame.attrs.id
                 
                 if (logger.level === 'trace') {
-                    logger.trace({ xml: WABinary_1.binaryNodeToString(frame), msg: 'recv xml' })
+                    logger.trace({ xml: binaryNodeToString(frame), msg: 'recv xml' })
                 }
                 
                 /* Check if this is a response to a message we sent */
-                anyTriggered = ws.emit(`${Defaults_1.DEF_TAG_PREFIX}${msgId}`, frame) || anyTriggered
+                anyTriggered = ws.emit(`${DEF_TAG_PREFIX}${msgId}`, frame) || anyTriggered
                 
                 /* Check if this is a response to a message we are expecting */
                 const l0 = frame.tag
@@ -446,13 +638,13 @@ const makeSocket = (config) => {
                 const l2 = Array.isArray(frame.content) ? frame.content[0]?.tag : ''
                 
                 for (const key of Object.keys(l1)) {
-                    anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`, frame) || anyTriggered
-                    anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`, frame) || anyTriggered
-                    anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}`, frame) || anyTriggered
+                    anyTriggered = ws.emit(`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`, frame) || anyTriggered
+                    anyTriggered = ws.emit(`${DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`, frame) || anyTriggered
+                    anyTriggered = ws.emit(`${DEF_CALLBACK_PREFIX}${l0},${key}`, frame) || anyTriggered
                 }
                 
-                anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},,${l2}`, frame) || anyTriggered
-                anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0}`, frame) || anyTriggered
+                anyTriggered = ws.emit(`${DEF_CALLBACK_PREFIX}${l0},,${l2}`, frame) || anyTriggered
+                anyTriggered = ws.emit(`${DEF_CALLBACK_PREFIX}${l0}`, frame) || anyTriggered
                 
                 if (!anyTriggered && logger.level === 'debug') {
                     logger.debug({ unhandled: true, msgId, fromMe: false, frame }, 'communication recv')
@@ -470,8 +662,10 @@ const makeSocket = (config) => {
         closed = true
         
         logger.info({ trace: error?.stack }, error ? 'connection errored' : 'connection closed')
+        
         clearInterval(keepAliveReq)
         clearTimeout(qrTimer)
+        
         ws.removeAllListeners('close')
         ws.removeAllListeners('open')
         ws.removeAllListeners('message')
@@ -480,7 +674,7 @@ const makeSocket = (config) => {
             try {
                 ws.close()
             }
-            catch (_a) { }
+            catch { }
         }
         
         ev.emit('connection.update', {
@@ -500,7 +694,7 @@ const makeSocket = (config) => {
         }
         
         if (ws.isClosed || ws.isClosing) {
-            throw new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed })
+            throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed });
         }
         
         let onOpen
@@ -509,6 +703,7 @@ const makeSocket = (config) => {
         await new Promise((resolve, reject) => {
             onOpen = () => resolve(undefined)
             onClose = mapWebSocketError(reject)
+            
             ws.on('open', onOpen)
             ws.on('close', onClose)
             ws.on('error', onClose)
@@ -531,7 +726,7 @@ const makeSocket = (config) => {
             it could be that the network is down
         */
         if (diff > keepAliveIntervalMs + 5000) {
-            end(new boom_1.Boom('Connection was lost', { statusCode: Types_1.DisconnectReason.connectionLost }))
+            end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }))
         }
         
         else if (ws.isOpen) {
@@ -540,7 +735,7 @@ const makeSocket = (config) => {
                 tag: 'iq',
                 attrs: {
                     id: generateMessageTag(),
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'get',
                     xmlns: 'w:p',
                 },
@@ -559,7 +754,7 @@ const makeSocket = (config) => {
     const sendPassiveIq = (tag) => (query({
         tag: 'iq',
         attrs: {
-            to: WABinary_1.S_WHATSAPP_NET,
+            to: S_WHATSAPP_NET,
             xmlns: 'passive',
             type: 'set',
         },
@@ -576,7 +771,7 @@ const makeSocket = (config) => {
             await sendNode({
                 tag: 'iq',
                 attrs: {
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    to: S_WHATSAPP_NET,
                     type: 'set',
                     id: generateMessageTag(),
                     xmlns: 'md'
@@ -593,14 +788,14 @@ const makeSocket = (config) => {
             })
         }
         
-        end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }))
+        end(new Boom(msg || 'Intentional Logout', { statusCode: DisconnectReason.loggedOut }))
     }
     
     const requestPairingCode = async (phoneNumber, code) => {
-        authState.creds.pairingCode = code?.toUpperCase() || Utils_1.asciiDecode([83, 85, 75, 49, 67, 72, 52, 78])
+        authState.creds.pairingCode = code?.toUpperCase() || asciiDecode([83, 85, 75, 49, 67, 72, 52, 78])
         
         authState.creds.me = {
-            id: WABinary_1.jidEncode(phoneNumber, 's.whatsapp.net'),
+            id: jidEncode(phoneNumber, 's.whatsapp.net'),
             name: '~'
         }
         
@@ -609,7 +804,7 @@ const makeSocket = (config) => {
         await sendNode({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 id: generateMessageTag(),
                 xmlns: 'md'
@@ -620,7 +815,6 @@ const makeSocket = (config) => {
                     attrs: {
                         jid: authState.creds.me.id,
                         stage: 'companion_hello',
-                        // eslint-disable-next-line camelcase
                         should_show_push_notification: 'true'
                     },
                     content: [
@@ -637,7 +831,7 @@ const makeSocket = (config) => {
                         {
                             tag: 'companion_platform_id',
                             attrs: {},
-                            content: Utils_1.getPlatformId(browser[1])
+                            content: getPlatformId(browser[1])
                         },
                         {
                             tag: 'companion_platform_display',
@@ -658,10 +852,10 @@ const makeSocket = (config) => {
     }
     
     async function generatePairingKey() {
-        const salt = crypto_1.randomBytes(32)
-        const randomIv = crypto_1.randomBytes(16)
-        const key = await Utils_1.derivePairingCodeKey(authState.creds.pairingCode, salt)
-        const ciphered = Utils_1.aesEncryptCTR(authState.creds.pairingEphemeralKeyPair.public, key, randomIv)
+        const salt = randomBytes(32)
+        const randomIv = randomBytes(16)
+        const key = await derivePairingCodeKey(authState.creds.pairingCode, salt)
+        const ciphered = aesEncryptCTR(authState.creds.pairingEphemeralKeyPair.public, key, randomIv)
         
         return Buffer.concat([salt, randomIv, ciphered])
     }
@@ -670,14 +864,14 @@ const makeSocket = (config) => {
         return query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 id: generateMessageTag(),
                 xmlns: 'w:stats'
             },
             content: [
                 {
                     tag: 'add',
-                    attrs: {},
+                    attrs: { t: Math.round(Date.now() / 1000) + '' },
                     content: wamBuffer
                 }
             ]
@@ -698,17 +892,17 @@ const makeSocket = (config) => {
     
     ws.on('error', mapWebSocketError(end))
     
-    ws.on('close', () => end(new boom_1.Boom('Connection Terminated', { statusCode: Types_1.DisconnectReason.connectionClosed })))
+    ws.on('close', () => end(new Boom('Connection Terminated', { statusCode: DisconnectReason.connectionClosed })))
     
     // the server terminated the connection
-    ws.on('CB:xmlstreamend', () => end(new boom_1.Boom('Connection Terminated by Server', { statusCode: Types_1.DisconnectReason.connectionClosed })))
+    ws.on('CB:xmlstreamend', () => end(new Boom('Connection Terminated by Server', { statusCode: DisconnectReason.connectionClosed })))
     
     // QR gen
     ws.on('CB:iq,type:set,pair-device', async (stanza) => {
         const iq = {
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'result',
                 id: stanza.attrs.id,
             }
@@ -716,8 +910,8 @@ const makeSocket = (config) => {
         
         await sendNode(iq)
         
-        const pairDeviceNode = WABinary_1.getBinaryNodeChild(stanza, 'pair-device')
-        const refNodes = WABinary_1.getBinaryNodeChildren(pairDeviceNode, 'ref')
+        const pairDeviceNode = getBinaryNodeChild(stanza, 'pair-device')
+        const refNodes = getBinaryNodeChildren(pairDeviceNode, 'ref')
         const noiseKeyB64 = Buffer.from(creds.noiseKey.public).toString('base64')
         const identityKeyB64 = Buffer.from(creds.signedIdentityKey.public).toString('base64')
         const advB64 = creds.advSecretKey
@@ -732,7 +926,7 @@ const makeSocket = (config) => {
             const refNode = refNodes.shift()
             
             if (!refNode) {
-                end(new boom_1.Boom('QR refs attempts ended', { statusCode: Types_1.DisconnectReason.timedOut }))
+                end(new Boom('QR refs attempts ended', { statusCode: DisconnectReason.timedOut }))
                 return
             }
             
@@ -752,7 +946,7 @@ const makeSocket = (config) => {
     ws.on('CB:iq,,pair-success', async (stanza) => {
         logger.debug('pair success recv')
         try {
-            const { reply, creds: updatedCreds } = Utils_1.configureSuccessfulPairing(stanza, creds)
+            const { reply, creds: updatedCreds } = configureSuccessfulPairing(stanza, creds)
             logger.info({ me: updatedCreds.me, platform: updatedCreds.platform }, 'pairing configured successfully, expect to restart the connection...')
             
             ev.emit('creds.update', updatedCreds)
@@ -767,21 +961,37 @@ const makeSocket = (config) => {
         }
     })
     
+    // login complete
     // login complete
     ws.on('CB:success', async (node) => {
         try {
             await uploadPreKeysToServerIfRequired()
             await sendPassiveIq('active')
+            
+            // After successful login, validate our key-bundle against server
+            try {
+                await digestKeyBundle()
+            }
+            
+            catch (e) {
+                logger.warn({ e }, 'failed to run digest after login');
+            }
         }
+        
         catch (err) {
-            logger.warn({ err }, 'failed to send initial passive iq');
+            logger.warn({ err }, 'failed to send initial passive iq')
         }
+        
         logger.info('opened connection to WA')
-        clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
+        
+        clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
+        
         ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } })
         ev.emit('connection.update', { connection: 'open' })
+        
         if (node.attrs.lid && authState.creds.me?.id) {
             const myLID = node.attrs.lid
+            
             process.nextTick(async () => {
                 try {
                     const myPN = authState.creds.me.id
@@ -789,10 +999,21 @@ const makeSocket = (config) => {
                     // Store our own LID-PN mapping
                     await signalRepository.lidMapping.storeLIDPNMappings([{ lid: myLID, pn: myPN }])
                     
-                    // Create LID session for ourselves (whatsmeow pattern)
-                    await signalRepository.migrateSession([myPN], myLID)
+                    // Create device list for our own user (needed for bulk migration)
+                    const { user, device } = jidDecode(myPN)
+                    
+                    await authState.keys.set({
+                        'device-list': {
+                            [user]: [device?.toString() || '0']
+                        }
+                    })
+                    
+                    // migrate our own session
+                    await signalRepository.migrateSession(myPN, myLID)
+                    
                     logger.info({ myPN, myLID }, 'Own LID session created successfully')
                 }
+                
                 catch (error) {
                     logger.error({ error, lid: myLID }, 'Failed to create own LID session')
                 }
@@ -801,21 +1022,24 @@ const makeSocket = (config) => {
     })
     
     ws.on('CB:stream:error', (node) => {
-        logger.error({ node }, 'stream errored out')
-        const { reason, statusCode } = Utils_1.getErrorCodeFromStreamError(node)
+        const [reasonNode] = getAllBinaryNodeChildren(node)
         
-        end(new boom_1.Boom(`Stream Errored (${reason})`, { statusCode, data: node }))
-    })
+        logger.error({ reasonNode, fullErrorNode: node }, 'stream errored out')
+        
+        const { reason, statusCode } = getErrorCodeFromStreamError(node)
+        
+        end(new Boom(`Stream Errored (${reason})`, { statusCode, data: reasonNode || node }))
+    });
     
     // stream fail, possible logout
     ws.on('CB:failure', (node) => {
         const reason = +(node.attrs.reason || 500)
         
-        end(new boom_1.Boom('Connection Failure', { statusCode: reason, data: node.attrs }))
+        end(new Boom('Connection Failure', { statusCode: reason, data: node.attrs }))
     })
     
     ws.on('CB:ib,,downgrade_webclient', () => {
-        end(new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch }))
+        end(new Boom('Multi-device beta not joined', { statusCode: DisconnectReason.multideviceMismatch }))
     })
     
     ws.on('CB:ib,,offline_preview', (node) => {
@@ -829,8 +1053,8 @@ const makeSocket = (config) => {
     })
     
     ws.on('CB:ib,,edge_routing', (node) => {
-        const edgeRoutingNode = WABinary_1.getBinaryNodeChild(node, 'edge_routing')
-        const routingInfo = WABinary_1.getBinaryNodeChild(edgeRoutingNode, 'routing_info')
+        const edgeRoutingNode = getBinaryNodeChild(node, 'edge_routing')
+        const routingInfo = getBinaryNodeChild(edgeRoutingNode, 'routing_info')
         
         if (routingInfo?.content) {
             authState.creds.routingInfo = Buffer.from(routingInfo?.content)
@@ -853,7 +1077,7 @@ const makeSocket = (config) => {
     
     // called when all offline notifs are handled
     ws.on('CB:ib,,offline', (node) => {
-        const child = WABinary_1.getBinaryNodeChild(node, 'offline')
+        const child = getBinaryNodeChild(node, 'offline')
         const offlineNotifs = +(child?.attrs.count || 0)
         
         logger.info(`handled ${offlineNotifs} offline messages/notifications`)
@@ -886,7 +1110,7 @@ const makeSocket = (config) => {
     })
     
     if (printQRInTerminal) {
-        Utils_1.printQRIfNecessaryListener(ev, logger)
+        printQRIfNecessaryListener(ev, logger)
     }
     
     return {
@@ -896,7 +1120,7 @@ const makeSocket = (config) => {
         authState: { creds, keys },
         signalRepository,
         get user() {
-            return authState.creds.me
+            return authState.creds.me;
         },
         generateMessageTag,
         query,
@@ -909,13 +1133,15 @@ const makeSocket = (config) => {
         onUnexpectedError,
         uploadPreKeys,
         uploadPreKeysToServerIfRequired,
+        digestKeyBundle,
+        rotateSignedPreKey,
         requestPairingCode,
+        wamBuffer: publicWAMBuffer,
         /** Waits for the connection to WA to reach a state */
-        waitForConnectionUpdate: Utils_1.bindWaitForConnectionUpdate(ev),
+        waitForConnectionUpdate: bindWaitForConnectionUpdate(ev),
         sendWAMBuffer,
-        executeUSyncQuery, 
-        onWhatsApp, 
-        logger
+        executeUSyncQuery,
+        onWhatsApp
     }
 }
 
@@ -925,7 +1151,7 @@ const makeSocket = (config) => {
  * */
 function mapWebSocketError(handler) {
     return (error) => {
-        handler(new boom_1.Boom(`WebSocket Error (${error?.message})`, { statusCode: Utils_1.getCodeFromWSError(error), data: error }))
+        handler(new Boom(`WebSocket Error (${error?.message})`, { statusCode: getCodeFromWSError(error), data: error }))
     }
 }