@hansaka02/baileys 7.3.2 → 7.3.4

package/lib/Socket/socket.js

@@ -2,17 +2,60 @@
 
 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, 
+  isLidUser,
+  jidDecode,
+  jidEncode, 
+  S_WHATSAPP_NET 
+} = require("../WABinary")
+const {
+  USyncUser, 
+  USyncQuery
+} = require("../WAUSync")
+const { WebSocketClient } = require("./Client")
 
 /**
  * Connects to WA servers and performs:
@@ -23,13 +66,13 @@ const WAUSync_1 = require("../WAUSync")
 const makeSocket = (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 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) {
@@ -45,10 +88,10 @@ const makeSocket = (config) => {
         let onRecv
         let onErr
         try {
-            return await Utils_1.promiseTimeout(timeoutMs, (resolve, reject) => {
+            return await promiseTimeout(timeoutMs, (resolve, reject) => {
                 onRecv = resolve
                 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
@@ -77,7 +120,7 @@ const makeSocket = (config) => {
         const result = await wait
         
         if ('tag' in result) {
-            WABinary_1.assertNodeErrorFree(result)
+            assertNodeErrorFree(result)
         }
         
         return result
@@ -85,7 +128,7 @@ const makeSocket = (config) => {
     
     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 +159,7 @@ const makeSocket = (config) => {
         const iq = {
             tag: 'iq',
             attrs: {
-                to: WABinary_1._WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'usync'
             },
@@ -140,14 +183,14 @@ const makeSocket = (config) => {
     }
     
     const onWhatsApp = async (...jids) => {
-        const usyncQuery = new WAUSync_1.USyncQuery().withLIDProtocol().withContactProtocol()
+        const usyncQuery = new USyncQuery().withLIDProtocol().withContactProtocol()
         for (const jid of jids) {
-            if (WABinary_1.isLidUser(jid)) {
-                usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid)) // intentional
+            if (isLidUser(jid)) {
+                usyncQuery.withUser(new USyncUser().withId(jid)) // intentional
             }
             else {
                 const phone = `+${jid.replace('+', '').split('@')[0]?.split(':')[0]}`
-                usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone))
+                usyncQuery.withUser(new USyncUser().withPhone(phone))
             }
         }
         const results = await executeUSyncQuery(usyncQuery)
@@ -162,18 +205,18 @@ const makeSocket = (config) => {
         }
     }
     
-    const ws = new Client_1.WebSocketClient(url, config)
+    const ws = new WebSocketClient(url, config)
     
     ws.connect()
-    const ev = Utils_1.makeEventBuffer(logger)
+    const ev = makeEventBuffer(logger)
     
     /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
-    const ephemeralKeyPair = Utils_1.Curve.generateKeyPair()
+    const ephemeralKeyPair = Curve.generateKeyPair()
     
     /** WA noise protocol wrapper */
-    const noise = Utils_1.makeNoiseHandler({
+    const noise = makeNoiseHandler({
         keyPair: ephemeralKeyPair,
-        NOISE_HEADER: Defaults_1.NOISE_WA_HEADER,
+        NOISE_HEADER: NOISE_WA_HEADER,
         logger,
         routingInfo: authState?.creds?.routingInfo
     })
@@ -181,7 +224,7 @@ const makeSocket = (config) => {
     const { creds } = authState
     
     // add transaction capability
-    const keys = Utils_1.addTransactionCapability(authState.keys, logger, transactionOpts)
+    const keys = addTransactionCapability(authState.keys, logger, transactionOpts)
     const signalRepository = makeSignalRepository({ creds, keys }, onWhatsApp, logger)
     
     let lastDateRecv
@@ -190,16 +233,16 @@ const makeSocket = (config) => {
     let qrTimer
     let closed = false
     
-    const sendPromise = util_1.promisify(ws.send)
+    const sendPromise = 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 })
+            throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed })
         }
         
         const bytes = noise.encodeFrame(data)
-        await Utils_1.promiseTimeout(connectTimeoutMs, async (resolve, reject) => {
+        await promiseTimeout(connectTimeoutMs, async (resolve, reject) => {
             try {
                 await sendPromise.call(ws, bytes)
                 resolve()
@@ -213,10 +256,10 @@ const makeSocket = (config) => {
     /** send a binary node */
     const sendNode = (frame) => {
         if (logger.level === 'trace') {
-            logger.trace({ xml: WABinary_1.binaryNodeToString(frame), msg: 'xml send' })
+            logger.trace({ xml: binaryNodeToString(frame), msg: 'xml send' })
         }
         
-        const buff = WABinary_1.encodeBinaryNode(frame)
+        const buff = encodeBinaryNode(frame)
         
         return sendRawMessage(buff)
     }
@@ -229,15 +272,15 @@ 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)
@@ -262,12 +305,12 @@ 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')
         
@@ -275,17 +318,17 @@ const makeSocket = (config) => {
         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())
+        const payloadEnc = noise.encrypt(proto.ClientPayload.encode(node).finish())
         
-        await sendRawMessage(WAProto_1.proto.HandshakeMessage.encode({
+        await sendRawMessage(proto.HandshakeMessage.encode({
             clientFinish: {
                 static: keyEnc,
                 payload: payloadEnc,
@@ -302,14 +345,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 +362,11 @@ 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 = INITIAL_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
             }
@@ -341,7 +384,7 @@ 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)
@@ -371,7 +414,7 @@ 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
@@ -399,7 +442,7 @@ const makeSocket = (config) => {
             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 <= MIN_PREKEY_COUNT
             const missingCurrentPreKey = !currentPreKeyExists && currentPreKeyId > 0
             const shouldUpload = lowServerCount || missingCurrentPreKey
             
@@ -434,11 +477,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 +489,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')
@@ -500,7 +543,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
@@ -531,7 +574,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 +583,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 +602,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 +619,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 +636,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 +652,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'
@@ -637,7 +680,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 +701,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,7 +713,7 @@ const makeSocket = (config) => {
         return query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 id: generateMessageTag(),
                 xmlns: 'w:stats'
             },
@@ -698,17 +741,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 +759,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 +775,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 +795,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)
@@ -802,20 +845,20 @@ const makeSocket = (config) => {
     
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out')
-        const { reason, statusCode } = Utils_1.getErrorCodeFromStreamError(node)
+        const { reason, statusCode } = getErrorCodeFromStreamError(node)
         
-        end(new boom_1.Boom(`Stream Errored (${reason})`, { statusCode, data: node }))
+        end(new Boom(`Stream Errored (${reason})`, { statusCode, data: 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 +872,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 +896,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 +929,7 @@ const makeSocket = (config) => {
     })
     
     if (printQRInTerminal) {
-        Utils_1.printQRIfNecessaryListener(ev, logger)
+        printQRIfNecessaryListener(ev, logger)
     }
     
     return {
@@ -911,7 +954,7 @@ const makeSocket = (config) => {
         uploadPreKeysToServerIfRequired,
         requestPairingCode,
         /** Waits for the connection to WA to reach a state */
-        waitForConnectionUpdate: Utils_1.bindWaitForConnectionUpdate(ev),
+        waitForConnectionUpdate: bindWaitForConnectionUpdate(ev),
         sendWAMBuffer,
         executeUSyncQuery, 
         onWhatsApp, 
@@ -925,7 +968,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 }))
     }
 }
 

package/lib/Socket/usync.js

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const boom_1 = require("@hapi/boom")
-const WABinary_1 = require("../WABinary")
-const socket_1 = require("./socket")
+const { Boom } = require("@hapi/boom")
+const { S_WHATSAPP_NET } = require("../WABinary")
+const { makeSocket } = require("./socket")
 
 const makeUSyncSocket = (config) => {
-    const suki = socket_1.makeSocket(config)
+    const suki = makeSocket(config)
     const { generateMessageTag, query, } = suki
     
     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
@@ -46,7 +46,7 @@ const makeUSyncSocket = (config) => {
         const iq = {
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'usync',
             },

package/lib/Store/index.js

@@ -1,22 +1,38 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+const __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
+
+    let desc = Object.getOwnPropertyDescriptor(m, k)
+
     if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k] } }
+      desc = {
+          enumerable: true, 
+          get: function() { 
+              return m[k] 
+          }
+       }
     }
-    Object.defineProperty(o, k2, desc)
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    o[k2] = m[k]
-}))
 
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p)
+    Object.defineProperty(o, k2, desc) 
+
+    }) : (function(o, m, k, k2) {
+        if (k2 === undefined) k2 = k
+        o[k2] = m[k]
+    }
+))
+
+const __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) {
+        if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) {
+            __createBinding(exports, m, p)
+       }
+   }
 }
 
-Object.defineProperty(exports, "__esModule", { value: true })
+Object.defineProperty(exports, "__esModule", { 
+    value: true 
+})
 
 __exportStar(require("./make-cache-manager-store"), exports) 
 __exportStar(require("./make-in-memory-store"), exports)