@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/WABinary/decode.js

@@ -1,46 +1,26 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
-
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod
-    var result = {}
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k)
-    __setModuleDefault(result, mod)
-    return result
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const util_1 = require("util")
-const zlib_1 = require("zlib")
-const constants = __importStar(require("./constants"))
-const jid_utils_1 = require("./jid-utils")
-const inflatePromise = util_1.promisify(zlib_1.inflate)
+const { promisify } = require("util")
+const { inflate } = require("zlib")
+const { 
+  jidEncode, 
+  WAJIDDomains
+} = require("./jid-utils")
+const constants = require("./constants")
+const inflatePromise = promisify(inflate)
 
 const decompressingIfRequired = async (buffer) => {
     if (2 & buffer.readUInt8()) {
         buffer = await inflatePromise(buffer.slice(1))
     }
-    else { // nodes with no compression have a 0x00 prefix, we remove that
+    
+    else {
+        // nodes with no compression have a 0x00 prefix, we remove that
         buffer = buffer.slice(1)
     }
+    
     return buffer
 }
 
@@ -54,7 +34,9 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     const next = () => {
         const value = buffer[indexRef.index]
+        
         indexRef.index += 1
+        
         return value
     }
     
@@ -65,8 +47,11 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     const readBytes = (n) => {
         checkEOS(n)
+        
         const value = buffer.slice(indexRef.index, indexRef.index + n)
+        
         indexRef.index += n
+        
         return value
     }
     
@@ -76,11 +61,14 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     const readInt = (n, littleEndian = false) => {
         checkEOS(n)
+        
         let val = 0
+        
         for (let i = 0; i < n; i++) {
             const shift = littleEndian ? i : n - 1 - i
             val |= next() << (shift * 8)
         }
+        
         return val
     }
     
@@ -93,6 +81,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         if (value >= 0 && value < 16) {
             return value < 10 ? '0'.charCodeAt(0) + value : 'A'.charCodeAt(0) + value - 10
         }
+        
         throw new Error('invalid hex: ' + value)
     }
     
@@ -100,6 +89,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         if (value >= 0 && value <= 9) {
             return '0'.charCodeAt(0) + value
         }
+        
         switch (value) {
             case 10:
                 return '-'.charCodeAt(0)
@@ -116,9 +106,11 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         if (tag === TAGS.NIBBLE_8) {
             return unpackNibble(value)
         }
+        
         else if (tag === TAGS.HEX_8) {
             return unpackHex(value)
         }
+        
         else {
             throw new Error('unknown tag: ' + tag)
         }
@@ -126,15 +118,20 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     const readPacked8 = (tag) => {
         const startByte = readByte()
+        
         let value = ''
+        
         for (let i = 0; i < (startByte & 127); i++) {
             const curByte = readByte()
+            
             value += String.fromCharCode(unpackByte(tag, (curByte & 0xf0) >> 4))
             value += String.fromCharCode(unpackByte(tag, curByte & 0x0f))
         }
+        
         if (startByte >> 7 !== 0) {
             value = value.slice(0, -1)
         }
+        
         return value
     }
     
@@ -158,23 +155,42 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     const readJidPair = () => {
         const i = readString(readByte())
         const j = readString(readByte())
+        
         if (j) {
             return (i || '') + '@' + j
         }
+        
         throw new Error('invalid jid pair: ' + i + ', ' + j)
     }
     
     const readAdJid = () => {
-        const agent = readByte()
+        const rawDomainType = readByte()
+        const domainType = Number(rawDomainType)
         const device = readByte()
         const user = readString(readByte())
-        return jid_utils_1.jidEncode(user, agent === 0 ? 's.whatsapp.net' : 'lid', device)
+        
+        let server = 's.whatsapp.net' // default whatsapp server
+        
+        if (domainType === WAJIDDomains.LID) {
+            server = 'lid'
+        }
+        
+        else if (domainType === WAJIDDomains.HOSTED) {
+            server = 'hosted'
+        }
+        
+        else if (domainType === WAJIDDomains.HOSTED_LID) {
+            server = 'hosted.lid'
+        }
+        
+        return jidEncode(user, server, device)
     }
     
     const readString = (tag) => {
         if (tag >= 1 && tag < SINGLE_BYTE_TOKENS.length) {
             return SINGLE_BYTE_TOKENS[tag] || ''
         }
+        
         switch (tag) {
             case TAGS.DICTIONARY_0:
             case TAGS.DICTIONARY_1:
@@ -204,21 +220,27 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     const readList = (tag) => {
         const items = []
         const size = readListSize(tag)
+        
         for (let i = 0; i < size; i++) {
             items.push(decodeDecompressedBinaryNode(buffer, opts, indexRef))
         }
+        
         return items
     }
     
     const getTokenDouble = (index1, index2) => {
         const dict = DOUBLE_BYTE_TOKENS[index1]
+        
         if (!dict) {
             throw new Error(`Invalid double token dict (${index1})`)
         }
+        
         const value = dict[index2]
+        
         if (typeof value === 'undefined') {
             throw new Error(`Invalid double token (${index2})`)
         }
+        
         return value
     }
     
@@ -239,6 +261,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     // read the attributes in
     const attributesLength = (listSize - 1) >> 1
+    
     for (let i = 0; i < attributesLength; i++) {
         const key = readString(readByte())
         const value = readString(readByte())
@@ -247,11 +270,14 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     
     if (listSize % 2 === 0) {
         const tag = readByte()
+        
         if (isListTag(tag)) {
             data = readList(tag)
         }
+        
         else {
             let decoded
+            
             switch (tag) {
                 case TAGS.BINARY_8:
                     decoded = readBytes(readByte())
@@ -266,9 +292,11 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
                     decoded = readString(tag)
                     break
             }
+            
             data = decoded
         }
     }
+    
     return {
         tag: header,
         attrs,

package/lib/WABinary/encode.js

@@ -1,35 +1,9 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, k)
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v })
-}) : function(o, v) {
-    o["default"] = v
-})
-
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod
-    var result = {}
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k)
-    __setModuleDefault(result, mod)
-    return result
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const constants = __importStar(require("./constants"))
-const jid_utils_1 = require("./jid-utils")
+const { jidDecode } = require("./jid-utils")
+const constants = require("./constants")
 
 const encodeBinaryNode = (node, opts = constants, buffer = [0]) => {
     const encoded = encodeBinaryNodeInner(node, opts, buffer)
@@ -53,22 +27,25 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
     }
     
     const pushInt16 = (value) => {
-        pushBytes([(value >> 8) & 0xff, value & 0xff])
+        pushBytes([(value >> 8) & 0xff, value & 0xff]);
     }
     
-    const pushInt20 = (value) => (pushBytes([(value >> 16) & 0x0f, (value >> 8) & 0xff, value & 0xff]))
+    const pushInt20 = (value) => pushBytes([(value >> 16) & 0x0f, (value >> 8) & 0xff, value & 0xff])
     const writeByteLength = (length) => {
         if (length >= 4294967296) {
-            throw new Error('string too large to encode: ' + length)
+            throw new Error('string too large to encode: ' + length);
         }
+        
         if (length >= 1 << 20) {
             pushByte(TAGS.BINARY_32)
             pushInt(length, 4) // 32 bit integer
         }
+        
         else if (length >= 256) {
             pushByte(TAGS.BINARY_20)
             pushInt20(length)
         }
+        
         else {
             pushByte(TAGS.BINARY_8)
             pushByte(length)
@@ -77,6 +54,7 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
     
     const writeStringRaw = (str) => {
         const bytes = Buffer.from(str, 'utf-8')
+        
         writeByteLength(bytes.length)
         pushBytes(bytes)
     }
@@ -85,17 +63,21 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (typeof device !== 'undefined') {
             pushByte(TAGS.AD_JID)
             pushByte(domainType || 0)
-            pushByte(device || 0)
+            pushByte(device || 0) 
             writeString(user)
         }
+        
         else {
             pushByte(TAGS.JID_PAIR)
+            
             if (user.length) {
                 writeString(user)
             }
+            
             else {
                 pushByte(TAGS.LIST_EMPTY)
             }
+            
             writeString(server)
         }
     }
@@ -112,6 +94,7 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
                 if (char >= '0' && char <= '9') {
                     return char.charCodeAt(0) - '0'.charCodeAt(0)
                 }
+                
                 throw new Error(`invalid byte for nibble "${char}"`)
         }
     }
@@ -120,15 +103,19 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (char >= '0' && char <= '9') {
             return char.charCodeAt(0) - '0'.charCodeAt(0)
         }
+        
         if (char >= 'A' && char <= 'F') {
             return 10 + char.charCodeAt(0) - 'A'.charCodeAt(0)
         }
+        
         if (char >= 'a' && char <= 'f') {
             return 10 + char.charCodeAt(0) - 'a'.charCodeAt(0)
         }
+        
         if (char === '\0') {
             return 15
         }
+        
         throw new Error(`Invalid hex char "${char}"`)
     }
     
@@ -136,21 +123,29 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (str.length > TAGS.PACKED_MAX) {
             throw new Error('Too many bytes to pack')
         }
+        
         pushByte(type === 'nibble' ? TAGS.NIBBLE_8 : TAGS.HEX_8)
+        
         let roundedLength = Math.ceil(str.length / 2.0)
+        
         if (str.length % 2 !== 0) {
             roundedLength |= 128
         }
+        
         pushByte(roundedLength)
+        
         const packFunction = type === 'nibble' ? packNibble : packHex
         const packBytePair = (v1, v2) => {
             const result = (packFunction(v1) << 4) | packFunction(v2)
             return result
         }
+        
         const strLengthHalf = Math.floor(str.length / 2)
+        
         for (let i = 0; i < strLengthHalf; i++) {
             pushByte(packBytePair(str[2 * i], str[2 * i + 1]))
         }
+        
         if (str.length % 2 !== 0) {
             pushByte(packBytePair(str[str.length - 1], '\x00'))
         }
@@ -160,12 +155,15 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (!str || str.length > TAGS.PACKED_MAX) {
             return false
         }
+        
         for (const char of str) {
             const isInNibbleRange = char >= '0' && char <= '9'
+            
             if (!isInNibbleRange && char !== '-' && char !== '.') {
                 return false
             }
         }
+        
         return true
     }
     
@@ -173,38 +171,49 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (!str || str.length > TAGS.PACKED_MAX) {
             return false
         }
+        
         for (const char of str) {
             const isInNibbleRange = char >= '0' && char <= '9'
+            
             if (!isInNibbleRange && !(char >= 'A' && char <= 'F')) {
                 return false
             }
         }
+        
         return true
     }
     
     const writeString = (str) => {
-    	if (str === undefined || str === null) {
+        if (str === undefined || str === null) {
             pushByte(TAGS.LIST_EMPTY)
             return
         }
+        
         const tokenIndex = TOKEN_MAP[str]
+        
         if (tokenIndex) {
             if (typeof tokenIndex.dict === 'number') {
                 pushByte(TAGS.DICTIONARY_0 + tokenIndex.dict)
             }
+            
             pushByte(tokenIndex.index)
         }
+        
         else if (isNibble(str)) {
             writePackedBytes(str, 'nibble')
         }
+        
         else if (isHex(str)) {
             writePackedBytes(str, 'hex')
         }
+        
         else if (str) {
-            const decodedJid = (0, jid_utils_1.jidDecode)(str)
+            const decodedJid = jidDecode(str)
+            
             if (decodedJid) {
                 writeJid(decodedJid)
             }
+            
             else {
                 writeStringRaw(str)
             }
@@ -215,9 +224,11 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         if (listSize === 0) {
             pushByte(TAGS.LIST_EMPTY)
         }
+        
         else if (listSize < 256) {
             pushBytes([TAGS.LIST_8, listSize])
         }
+        
         else {
             pushByte(TAGS.LIST_16)
             pushInt16(listSize)
@@ -228,35 +239,45 @@ const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
         throw new Error('Invalid node: tag cannot be undefined')
     }
     
-    const validAttributes = Object.keys(attrs).filter(k => (typeof attrs[k] !== 'undefined' && attrs[k] !== null))
+    const validAttributes = Object.keys(attrs || {}).filter(k => typeof attrs[k] !== 'undefined' && attrs[k] !== null)
+    
     writeListStart(2 * validAttributes.length + 1 + (typeof content !== 'undefined' ? 1 : 0))
     writeString(tag)
+    
     for (const key of validAttributes) {
         if (typeof attrs[key] === 'string') {
             writeString(key)
             writeString(attrs[key])
         }
     }
+    
     if (typeof content === 'string') {
         writeString(content)
     }
+    
     else if (Buffer.isBuffer(content) || content instanceof Uint8Array) {
         writeByteLength(content.length)
         pushBytes(content)
     }
+    
     else if (Array.isArray(content)) {
-    	const validContent = content.filter(item => item && (item.tag || Buffer.isBuffer(item) || item instanceof Uint8Array || typeof item === 'string'))
+        const validContent = content.filter(item => item && (item.tag || Buffer.isBuffer(item) || item instanceof Uint8Array || typeof item === 'string'))
+        
         writeListStart(validContent.length)
+        
         for (const item of validContent) {
             encodeBinaryNodeInner(item, opts, buffer)
         }
     }
+    
     else if (typeof content === 'undefined') {
         // do nothing
     }
+    
     else {
         throw new Error(`invalid children for header "${tag}": ${content} (${typeof content})`)
     }
+    
     return buffer
 }
 

package/lib/WABinary/generic-utils.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const boom_1 = require("@hapi/boom")
-const WAProto_1 = require("../../WAProto")
+const { Boom } = require("@hapi/boom")
+const { proto } = require("../../WAProto")
 
 // some extra useful utilities
 const getBinaryNodeChildren = (node, childTag) => {
@@ -53,7 +53,7 @@ const getBinaryNodeChildUInt = (node, childTag, length) => {
 const assertNodeErrorFree = (node) => {
     const errNode = getBinaryNodeChild(node, 'error')
     if (errNode) {
-        throw new boom_1.Boom(errNode.attrs.text || 'Unknown error', { data: +errNode.attrs.code })
+        throw new Boom(errNode.attrs.text || 'Unknown error', { data: +errNode.attrs.code })
     }
 }
 
@@ -71,7 +71,7 @@ const getBinaryNodeMessages = ({ content }) => {
     if (Array.isArray(content)) {
         for (const item of content) {
             if (item.tag === 'message') {
-                msgs.push(WAProto_1.proto.WebMessageInfo.decode(item.content))
+                msgs.push(proto.WebMessageInfo.decode(item.content))
             }
         }
     }

package/lib/WABinary/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("./encode"), exports)
 __exportStar(require("./decode"), exports)