@neelegirl/baileys 1.5.2 → 1.5.3

package/lib/WABinary/generic-utils.js

@@ -1,142 +1,142 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const boom_1 = require("@hapi/boom")
-const WAProto_1 = require("../../WAProto")
-
-// some extra useful utilities
-const getBinaryNodeChildren = (node, childTag) => {
-    if (Array.isArray(node?.content)) {
-        return node.content.filter(item => item.tag === childTag)
-    }
-    return []
-}
-
-const getAllBinaryNodeChildren = ({ content }) => {
-    if (Array.isArray(content)) {
-        return content
-    }
-    return []
-}
-
-const getBinaryNodeChild = (node, childTag) => {
-    if (Array.isArray(node?.content)) {
-        return node?.content.find(item => item.tag === childTag)
-    }
-}
-
-const getBinaryNodeChildBuffer = (node, childTag) => {
-    const child = getBinaryNodeChild(node, childTag)?.content
-    if (Buffer.isBuffer(child) || child instanceof Uint8Array) {
-        return child
-    }
-}
-
-const getBinaryNodeChildString = (node, childTag) => {
-    const child = getBinaryNodeChild(node, childTag)?.content
-    if (Buffer.isBuffer(child) || child instanceof Uint8Array) {
-        return Buffer.from(child).toString('utf-8')
-    }
-    else if (typeof child === 'string') {
-        return child
-    }
-}
-
-const getBinaryNodeChildUInt = (node, childTag, length) => {
-    const buff = getBinaryNodeChildBuffer(node, childTag)
-    if (buff) {
-        return bufferToUInt(buff, 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 })
-    }
-}
-
-const reduceBinaryNodeToDictionary = (node, tag) => {
-    const nodes = getBinaryNodeChildren(node, tag)
-    const dict = nodes.reduce((dict, { attrs }) => {
-        dict[attrs.name || attrs.config_code] = attrs.value || attrs.config_value
-        return dict
-    }, {})
-    return dict
-}
-
-const getBinaryNodeMessages = ({ content }) => {
-    const msgs = []
-    if (Array.isArray(content)) {
-        for (const item of content) {
-            if (item.tag === 'message') {
-                msgs.push(WAProto_1.proto.WebMessageInfo.decode(item.content))
-            }
-        }
-    }
-    return msgs
-}
-
-const getBinaryFilteredButtons = (nodeContent) => {
-	if (!Array.isArray(nodeContent)) return false
-
-    return nodeContent.some(a =>
-        ['native_flow'].includes(a?.content?.[0]?.content?.[0]?.tag) ||
-        ['interactive', 'buttons', 'list'].includes(a?.content?.[0]?.tag) ||
-        ['hsm', 'biz'].includes(a?.tag)
-    )
-}
-
-const getBinaryFilteredBizBot = (nodeContent) => {
-    if (!Array.isArray(nodeContent)) return false 
-
-    return nodeContent.some(b => 
-        ['bot'].includes(b?.tag) && b?.attrs?.biz_bot === '1'
-    ) 
-}
-
-function bufferToUInt(e, t) {
-    let a = 0
-    for (let i = 0; i < t; i++) {
-        a = 256 * a + e[i]
-    }
-    return a
-}
-const tabs = (n) => '\t'.repeat(n)
-function binaryNodeToString(node, i = 0) {
-    if (!node) {
-        return node
-    }
-    if (typeof node === 'string') {
-        return tabs(i) + node
-    }
-    if (node instanceof Uint8Array) {
-        return tabs(i) + Buffer.from(node).toString('hex')
-    }
-    if (Array.isArray(node)) {
-        return node.map((x) => tabs(i + 1) + binaryNodeToString(x, i + 1)).join('\n')
-    }
-    const children = binaryNodeToString(node.content, i + 1)
-    const tag = `<${node.tag} ${Object.entries(node.attrs || {})
-        .filter(([, v]) => v !== undefined)
-        .map(([k, v]) => `${k}='${v}'`)
-        .join(' ')}`
-    const content = children ? `>\n${children}\n${tabs(i)}</${node.tag}>` : '/>'
-    return tag + content
-}
-
-module.exports = {
-  getBinaryNodeChildren, 
-  getAllBinaryNodeChildren, 
-  getBinaryNodeChild, 
-  getBinaryNodeChildBuffer, 
-  getBinaryNodeChildString, 
-  getBinaryNodeChildUInt, 
-  assertNodeErrorFree, 
-  reduceBinaryNodeToDictionary, 
-  getBinaryNodeMessages, 
-  getBinaryFilteredButtons, 
-  getBinaryFilteredBizBot, 
-  binaryNodeToString
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const boom_1 = require("@hapi/boom")
+const WAProto_1 = require("../../WAProto")
+
+// some extra useful utilities
+const getBinaryNodeChildren = (node, childTag) => {
+    if (Array.isArray(node?.content)) {
+        return node.content.filter(item => item.tag === childTag)
+    }
+    return []
+}
+
+const getAllBinaryNodeChildren = ({ content }) => {
+    if (Array.isArray(content)) {
+        return content
+    }
+    return []
+}
+
+const getBinaryNodeChild = (node, childTag) => {
+    if (Array.isArray(node?.content)) {
+        return node?.content.find(item => item.tag === childTag)
+    }
+}
+
+const getBinaryNodeChildBuffer = (node, childTag) => {
+    const child = getBinaryNodeChild(node, childTag)?.content
+    if (Buffer.isBuffer(child) || child instanceof Uint8Array) {
+        return child
+    }
+}
+
+const getBinaryNodeChildString = (node, childTag) => {
+    const child = getBinaryNodeChild(node, childTag)?.content
+    if (Buffer.isBuffer(child) || child instanceof Uint8Array) {
+        return Buffer.from(child).toString('utf-8')
+    }
+    else if (typeof child === 'string') {
+        return child
+    }
+}
+
+const getBinaryNodeChildUInt = (node, childTag, length) => {
+    const buff = getBinaryNodeChildBuffer(node, childTag)
+    if (buff) {
+        return bufferToUInt(buff, 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 })
+    }
+}
+
+const reduceBinaryNodeToDictionary = (node, tag) => {
+    const nodes = getBinaryNodeChildren(node, tag)
+    const dict = nodes.reduce((dict, { attrs }) => {
+        dict[attrs.name || attrs.config_code] = attrs.value || attrs.config_value
+        return dict
+    }, {})
+    return dict
+}
+
+const getBinaryNodeMessages = ({ content }) => {
+    const msgs = []
+    if (Array.isArray(content)) {
+        for (const item of content) {
+            if (item.tag === 'message') {
+                msgs.push(WAProto_1.proto.WebMessageInfo.decode(item.content))
+            }
+        }
+    }
+    return msgs
+}
+
+const getBinaryFilteredButtons = (nodeContent) => {
+	if (!Array.isArray(nodeContent)) return false
+
+    return nodeContent.some(a =>
+        ['native_flow'].includes(a?.content?.[0]?.content?.[0]?.tag) ||
+        ['interactive', 'buttons', 'list'].includes(a?.content?.[0]?.tag) ||
+        ['hsm', 'biz'].includes(a?.tag)
+    )
+}
+
+const getBinaryFilteredBizBot = (nodeContent) => {
+    if (!Array.isArray(nodeContent)) return false 
+
+    return nodeContent.some(b => 
+        ['bot'].includes(b?.tag) && b?.attrs?.biz_bot === '1'
+    ) 
+}
+
+function bufferToUInt(e, t) {
+    let a = 0
+    for (let i = 0; i < t; i++) {
+        a = 256 * a + e[i]
+    }
+    return a
+}
+const tabs = (n) => '\t'.repeat(n)
+function binaryNodeToString(node, i = 0) {
+    if (!node) {
+        return node
+    }
+    if (typeof node === 'string') {
+        return tabs(i) + node
+    }
+    if (node instanceof Uint8Array) {
+        return tabs(i) + Buffer.from(node).toString('hex')
+    }
+    if (Array.isArray(node)) {
+        return node.map((x) => tabs(i + 1) + binaryNodeToString(x, i + 1)).join('\n')
+    }
+    const children = binaryNodeToString(node.content, i + 1)
+    const tag = `<${node.tag} ${Object.entries(node.attrs || {})
+        .filter(([, v]) => v !== undefined)
+        .map(([k, v]) => `${k}='${v}'`)
+        .join(' ')}`
+    const content = children ? `>\n${children}\n${tabs(i)}</${node.tag}>` : '/>'
+    return tag + content
+}
+
+module.exports = {
+  getBinaryNodeChildren, 
+  getAllBinaryNodeChildren, 
+  getBinaryNodeChild, 
+  getBinaryNodeChildBuffer, 
+  getBinaryNodeChildString, 
+  getBinaryNodeChildUInt, 
+  assertNodeErrorFree, 
+  reduceBinaryNodeToDictionary, 
+  getBinaryNodeMessages, 
+  getBinaryFilteredButtons, 
+  getBinaryFilteredBizBot, 
+  binaryNodeToString
 }

package/lib/WABinary/index.d.ts

@@ -1,5 +1,5 @@
-export * from './encode'
-export * from './decode'
-export * from './generic-utils'
-export * from './jid-utils'
-export * from './types'
+export * from '@neelegirl/baileys/lib/WABinary/encode'
+export * from '@neelegirl/baileys/lib/WABinary/decode'
+export * from '@neelegirl/baileys/lib/WABinary/generic-utils'
+export * from '@neelegirl/baileys/lib/WABinary/jid-utils'
+export * from '@neelegirl/baileys/lib/WABinary/types'

package/lib/WABinary/index.js

@@ -1,25 +1,25 @@
-"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 __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 })
-
-__exportStar(require("./encode"), exports)
-__exportStar(require("./decode"), exports)
-__exportStar(require("./generic-utils"), exports)
-__exportStar(require("./jid-utils"), exports)
+"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 __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 })
+
+__exportStar(require("./encode"), exports)
+__exportStar(require("./decode"), exports)
+__exportStar(require("./generic-utils"), exports)
+__exportStar(require("./jid-utils"), exports)
 __exportStar(require("./types"), exports)

package/lib/WABinary/jid-utils.d.ts

@@ -1,53 +1,58 @@
-export declare const S_WHATSAPP_NET = "@s.whatsapp.net"
-
-export declare const OFFICIAL_BIZ_JID = "16505361212@c.us"
-
-export declare const SERVER_JID = "server@c.us"
-
-export declare const PSA_WID = "0@c.us"
-
-export declare const STORIES_JID = "status@broadcast"
-
-export declare const META_AI_JID = '13135550002@c.us'
-
-export type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call' | 'lid' | 'newsletter' | 'bot'
-
-export type JidWithDevice = {
-    user: string
-    device?: number
-}
-
-export type FullJid = JidWithDevice & {
-    server: JidServer
-    domainType?: number
-}
-
-export declare const jidEncode: (user: string | number | null, server: JidServer, device?: number, agent?: number) => string
-
-export declare const jidDecode: (jid: string | undefined) => FullJid | undefined
-
-/** is the jid a user */
-export declare const areJidsSameUser: (jid1: string | undefined, jid2: string | undefined) => boolean
-
-/** is the lid a user */
-export declare const isJidUser: (jid: string | undefined) => boolean | undefined
-
-/** is the jid a group */
-export declare const isLidUser: (jid: string | undefined) => boolean | undefined
-
-/** is the jid a broadcast */
-export declare const isJidBroadcast: (jid: string | undefined) => boolean | undefined
-
-/** is the jid a group */
-export declare const isJidGroup: (jid: string | undefined) => boolean | undefined
-
-/** is the jid the status broadcast */
-export declare const isJidStatusBroadcast: (jid: string) => boolean
-
-/** is the jid a newsletter */
-export declare const isJidNewsletter: (jid: string | undefined) => boolean | undefined
-
-/** is the jid a bot */
-export declare const isJidBot: (jid: string | undefined) => boolean | undefined
-
-export declare const jidNormalizedUser: (jid: string | undefined) => string
+export declare const S_WHATSAPP_NET = "@s.whatsapp.net"
+
+export declare const OFFICIAL_BIZ_JID = "16505361212@c.us"
+
+export declare const SERVER_JID = "server@c.us"
+
+export declare const PSA_WID = "0@c.us"
+
+export declare const STORIES_JID = "status@broadcast"
+
+export declare const META_AI_JID = '13135550002@c.us'
+
+export type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call' | 'lid' | 'newsletter' | 'bot'
+
+export type JidWithDevice = {
+    user: string
+    device?: number
+}
+
+export type FullJid = JidWithDevice & {
+    server: JidServer
+    domainType?: number
+}
+
+export declare const jidEncode: (user: string | number | null, server: JidServer, device?: number, agent?: number) => string
+
+export declare const jidDecode: (jid: string | undefined) => FullJid | undefined
+
+/** is the jid Meta AI */
+export declare const isJidMetaAI: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a user */
+export declare const areJidsSameUser: (jid1: string | undefined, jid2: string | undefined) => boolean
+
+/** is the lid a user */
+export declare const isJidUser: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a group */
+export declare const isLidUser: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a broadcast */
+export declare const isJidBroadcast: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a group */
+export declare const isJidGroup: (jid: string | undefined) => boolean | undefined
+
+/** is the jid the status broadcast */
+export declare const isJidStatusBroadcast: (jid: string) => boolean
+
+/** is the jid a newsletter */
+export declare const isJidNewsletter: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a bot */
+export declare const isJidBot: (jid: string | undefined) => boolean | undefined
+
+export declare const jidNormalizedUser: (jid: string | undefined) => string
+
+export declare const transferDevice: (fromJid: string, toJid: string) => string

package/lib/WABinary/jid-utils.js

@@ -1,92 +1,104 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const S_WHATSAPP_NET = '@s.whatsapp.net'
-
-const OFFICIAL_BIZ_JID = '16505361212@c.us'
-
-const SERVER_JID = 'server@c.us'
-
-const PSA_WID = '0@c.us'
-
-const STORIES_JID = 'status@broadcast'
-
-const META_AI_JID = '13135550002@c.us'
-
-const jidEncode = (user, server, device, agent) => {
-    return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`
-}
-
-const jidDecode = (jid) => {
-    const sepIdx = typeof jid === 'string' ? jid.indexOf('@') : -1
-    if (sepIdx < 0) {
-        return undefined
-    }
-    const server = jid.slice(sepIdx + 1)
-    const userCombined = jid.slice(0, sepIdx)
-    const [userAgent, device] = userCombined.split(':')
-    const user = userAgent.split('_')[0]
-    return {
-        server: server,
-        user,
-        domainType: server === 'lid' ? 1 : 0,
-        device: device ? +device : undefined
-    }
-}
-
-/** is the jid a user */
-const areJidsSameUser = (jid1, jid2) => {
-    return jidDecode(jid1)?.user === jidDecode(jid2)?.user
-}
-
-/** is the jid a user */
-const isJidUser = (jid) => jid?.endsWith('@s.whatsapp.net')
-
-/** is the lid a user */
-const isLidUser = (jid) => jid?.endsWith('@lid')
-
-/** is the jid a broadcast */
-const isJidBroadcast = (jid) => jid?.endsWith('@broadcast')
-
-/** is the jid a group */
-const isJidGroup = (jid) => jid?.endsWith('@g.us')
-
-/** is the jid the status broadcast */
-const isJidStatusBroadcast = (jid) => jid === 'status@broadcast'
-
-/** is the jid a newsletter */
-const isJidNewsletter = (jid) => jid?.endsWith('@newsletter')
-
-/** is the jid a bot */
-const botRegexp = /^1313555\d{4}$|^131655500\d{2}$/
-const isJidBot = (jid) => (jid && botRegexp.test(jid.split('@')[0]) && jid.endsWith('@c.us'))
-
-const jidNormalizedUser = (jid) => {
-    const result = jidDecode(jid)
-    if (!result) {
-        return ''
-    }
-    const { user, server } = result
-    return jidEncode(user, server === 'c.us' ? 's.whatsapp.net' : server)
-}
-
-module.exports = {
-  S_WHATSAPP_NET, 
-  OFFICIAL_BIZ_JID, 
-  SERVER_JID, 
-  PSA_WID, 
-  STORIES_JID, 
-  META_AI_JID, 
-  jidEncode, 
-  jidDecode, 
-  areJidsSameUser, 
-  isJidUser, 
-  isLidUser, 
-  isJidBroadcast, 
-  isJidGroup, 
-  isJidStatusBroadcast, 
-  isJidNewsletter, 
-  isJidBot, 
-  jidNormalizedUser
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const S_WHATSAPP_NET = '@s.whatsapp.net'
+
+const OFFICIAL_BIZ_JID = '16505361212@c.us'
+
+const SERVER_JID = 'server@c.us'
+
+const PSA_WID = '0@c.us'
+
+const STORIES_JID = 'status@broadcast'
+
+const META_AI_JID = '13135550002@c.us'
+
+const jidEncode = (user, server, device, agent) => {
+    return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`
+}
+
+const jidDecode = (jid) => {
+    const sepIdx = typeof jid === 'string' ? jid.indexOf('@') : -1
+    if (sepIdx < 0) {
+        return undefined
+    }
+    const server = jid.slice(sepIdx + 1)
+    const userCombined = jid.slice(0, sepIdx)
+    const [userAgent, device] = userCombined.split(':')
+    const user = userAgent.split('_')[0]
+    return {
+        server: server,
+        user,
+        domainType: server === 'lid' ? 1 : 0,
+        device: device ? +device : undefined
+    }
+}
+
+/** is the jid a user */
+const areJidsSameUser = (jid1, jid2) => {
+    return jidDecode(jid1)?.user === jidDecode(jid2)?.user
+}
+
+/** is the jid Meta AI */
+const isJidMetaAI = (jid) => jid?.endsWith('@bot')
+
+/** is the jid a user */
+const isJidUser = (jid) => jid?.endsWith('@s.whatsapp.net')
+
+/** is the lid a user */
+const isLidUser = (jid) => jid?.endsWith('@lid')
+
+/** is the jid a broadcast */
+const isJidBroadcast = (jid) => jid?.endsWith('@broadcast')
+
+/** is the jid a group */
+const isJidGroup = (jid) => jid?.endsWith('@g.us')
+
+/** is the jid the status broadcast */
+const isJidStatusBroadcast = (jid) => jid === 'status@broadcast'
+
+/** is the jid a newsletter */
+const isJidNewsletter = (jid) => jid?.endsWith('@newsletter')
+
+/** is the jid a bot */
+const botRegexp = /^1313555\d{4}$|^131655500\d{2}$/
+const isJidBot = (jid) => (jid && botRegexp.test(jid.split('@')[0]) && jid.endsWith('@c.us'))
+
+const jidNormalizedUser = (jid) => {
+    const result = jidDecode(jid)
+    if (!result) {
+        return ''
+    }
+    const { user, server } = result
+    return jidEncode(user, server === 'c.us' ? 's.whatsapp.net' : server)
+}
+
+const transferDevice = (fromJid, toJid) => {
+    const fromDecoded = jidDecode(fromJid)
+    const deviceId = fromDecoded?.device || 0
+    const { server, user } = jidDecode(toJid)
+    return jidEncode(user, server, deviceId)
+}
+
+module.exports = {
+  S_WHATSAPP_NET, 
+  OFFICIAL_BIZ_JID, 
+  SERVER_JID, 
+  PSA_WID, 
+  STORIES_JID, 
+  META_AI_JID, 
+  jidEncode, 
+  jidDecode, 
+  areJidsSameUser, 
+  isJidMetaAI, 
+  isJidUser, 
+  isLidUser, 
+  isJidBroadcast, 
+  isJidGroup, 
+  isJidStatusBroadcast, 
+  isJidNewsletter, 
+  isJidBot, 
+  transferDevice, 
+  jidNormalizedUser
 }