@fhynella/baileys 2.0.5 → 2.1.7

package/lib/Socket/messages-send.js

@@ -1,39 +1,83 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"))
-const boom_1 = require("@hapi/boom")
-const crypto_1 = require("crypto")
-const WAProto_1 = require("../../WAProto")
-const Defaults_1 = require("../Defaults")
-const Utils_1 = require("../Utils")
-const Types_1 = require("../Types")
-const WABinary_1 = require("../WABinary")
-const WAUSync_1 = require("../WAUSync")
-const newsletter_1 = require("./newsletter")
-const link_preview_1 = require("../Utils/link-preview")
-const make_keyed_mutex_1 = require("../Utils/make-mutex") 
+const { default: NodeCache } = require("@cacheable/node-cache")
+const { Boom } = require("@hapi/boom")
+const { randomBytes } = require("crypto")
+const { proto } = require("../../WAProto")
+const {
+  DEFAULT_CACHE_TTLS, 
+  WA_DEFAULT_EPHEMERAL
+} = require("../Defaults/constants")
+const { 
+  delay, 
+  assertMediaContent, 
+  bindWaitForEvent, 
+  decryptMediaRetryData, 
+  encodeNewsletterMessage, 
+  encodeSignedDeviceIdentity, 
+  encodeWAMessage, 
+  encryptMediaRetryRequest,
+  extractDeviceJids, 
+  generateMessageID, 
+  generateParticipantHashV2,
+  generateWAMessage, 
+  generateWAMessageFromContent, 
+  getStatusCodeForMediaRetry, 
+  getUrlFromDirectPath, 
+  getWAUploadToServer, 
+  MessageRetryManager, 
+  normalizeMessageContent, 
+  parseAndInjectE2ESessions, 
+  unixTimestampSeconds,  
+  prepareAlbumMessageContent, 
+  aggregateMessageKeysNotFromMe
+} = require("../Utils")
+const {
+  QueryIds, 
+  XWAPaths, 
+  WAMessageAddressingMode
+} = require("../Types")
+const { 
+  areJidsSameUser, 
+  getBinaryNodeChild, 
+  getBinaryNodeChildren, 
+  getBinaryFilteredBizBot, 
+  getBinaryFilteredButtons, 
+  isJidNewsletter, 
+  isJidGroup,
+  isLidUser, 
+  isJidUser, 
+  jidDecode,  
+  jidEncode, 
+  jidNormalizedUser,
+  STORIES_JID, 
+  S_WHATSAPP_NET 
+} = require("../WABinary")
+const {
+  USyncUser, 
+  USyncQuery
+} = require("../WAUSync") 
+const { makeNewsletterSocket } = require("./newsletter")
+const { getUrlInfo } = require("../Utils/link-preview")
+const { makeKeyedMutex } = require("../Utils/make-mutex") 
 
 const makeMessagesSocket = (config) => {
     const { logger, maxMsgRetryCount, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: axiosOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache } = config
-    const suki = newsletter_1.makeNewsletterSocket(config)
+    const suki = makeNewsletterSocket(config)
     const { ev, authState, processingMutex, signalRepository, upsertMessage, createCallLink, query, fetchPrivacySettings, sendNode, groupQuery, groupMetadata, groupToggleEphemeral, newsletterWMexQuery, executeUSyncQuery } = suki   
 
-    const userDevicesCache = config.userDevicesCache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.USER_DEVICES,
+    const userDevicesCache = config.userDevicesCache || new NodeCache({
+        stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
         useClones: false
     })
     
     // Initialize message retry manager if enabled
-    const messageRetryManager = enableRecentMessageCache ? new Utils_1.MessageRetryManager(logger, maxMsgRetryCount) : null
+    const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null
     
     // Prevent race conditions in Signal session encryption by user
-    const encryptionMutex = make_keyed_mutex_1.makeKeyedMutex()
+    const encryptionMutex = makeKeyedMutex()
 
     let mediaConn
 
@@ -48,15 +92,15 @@ const makeMessagesSocket = (config) => {
                     attrs: {
                         type: 'set',
                         xmlns: 'w:m',
-                        to: WABinary_1.S_WHATSAPP_NET,
+                        to: S_WHATSAPP_NET,
                     },
                     content: [{ tag: 'media_conn', attrs: {} }]
                 })
 
-                const mediaConnNode = WABinary_1.getBinaryNodeChild(result, 'media_conn')
+                const mediaConnNode = getBinaryNodeChild(result, 'media_conn')
 
                 const node = {
-                    hosts: WABinary_1.getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                    hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
                         hostname: attrs.hostname,
                         maxContentLengthBytes: +attrs.maxContentLengthBytes,
                     })),
@@ -89,10 +133,10 @@ const makeMessagesSocket = (config) => {
         const isReadReceipt = type === 'read' || type === 'read-self'
 
         if (isReadReceipt) {
-            node.attrs.t = Utils_1.unixTimestampSeconds().toString()
+            node.attrs.t = unixTimestampSeconds().toString()
         }
 
-        if (type === 'sender' && WABinary_1.isJidUser(jid)) {
+        if (type === 'sender' && isJidUser(jid)) {
             node.attrs.recipient = jid
             node.attrs.to = participant
         }
@@ -105,7 +149,7 @@ const makeMessagesSocket = (config) => {
         }
 
         if (type) {
-            node.attrs.type = WABinary_1.isJidNewsletter(jid) ? 'read-self' : type
+            node.attrs.type = isJidNewsletter(jid) ? 'read-self' : type
         }
 
         const remainingMessageIds = messageIds.slice(1)
@@ -130,7 +174,7 @@ const makeMessagesSocket = (config) => {
 
     /** Correctly bulk send receipts to multiple chats, participants */
     const sendReceipts = async (keys, type) => {
-        const recps = Utils_1.aggregateMessageKeysNotFromMe(keys)
+        const recps = aggregateMessageKeysNotFromMe(keys)
 
         for (const { jid, participant, messageIds } of recps) {
             await sendReceipt(jid, participant, messageIds, type)
@@ -157,8 +201,8 @@ const makeMessagesSocket = (config) => {
         
         // Collect all LID users
         for (const jid of jids) {
-            if (WABinary_1.isLidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
+            if (isLidUser(jid)) {
+                const user = jidDecode(jid)?.user
                 if (user)
                     lidUsers.add(user)
             }
@@ -166,8 +210,8 @@ const makeMessagesSocket = (config) => {
         
         // Filter out PN versions when LID exists
         for (const jid of jids) {
-            if (WABinary_1.isJidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
+            if (isJidUser(jid)) {
+                const user = jidDecode(jid)?.user
                 if (user && lidUsers.has(user)) {
                     logger.debug({ jid }, 'Skipping PN - LID version exists')
                     continue
@@ -180,9 +224,9 @@ const makeMessagesSocket = (config) => {
 
     /** Fetch image for groups, user, and newsletter **/
     const profilePictureUrl = async (jid) => {
-        if (WABinary_1.isJidNewsletter(jid)) {
+        if (isJidNewsletter(jid)) {
 
-            let node = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
+            let node = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
            input: {
                key: jid, 
                type: 'JID',
@@ -193,11 +237,11 @@ const makeMessagesSocket = (config) => {
               fetch_creation_time: true
           })
 
-         let result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
+         let result = getBinaryNodeChild(node, 'result')?.content?.toString()
 
-         let metadata = JSON.parse(result).data[Types_1.XWAPaths.NEWSLETTER]         
+         let metadata = JSON.parse(result).data[XWAPaths.NEWSLETTER]         
 
-         return Utils_1.getUrlFromDirectPath(metadata.thread_metadata.picture?.direct_path || '') 
+         return getUrlFromDirectPath(metadata.thread_metadata.picture?.direct_path || '') 
 
         } 
 
@@ -205,8 +249,8 @@ const makeMessagesSocket = (config) => {
             const result = await query({
                 tag: 'iq',
                 attrs: {
-                    target: WABinary_1.jidNormalizedUser(jid),
-                    to: WABinary_1.S_WHATSAPP_NET,
+                    target: jidNormalizedUser(jid),
+                    to: S_WHATSAPP_NET,
                     type: 'get',
                     xmlns: 'w:profile:picture'
                  },
@@ -219,7 +263,7 @@ const makeMessagesSocket = (config) => {
                  }]
             })
 
-            const child = WABinary_1.getBinaryNodeChild(result, 'picture')
+            const child = getBinaryNodeChild(result, 'picture')
 
             return child?.attrs?.url || null
           }
@@ -238,7 +282,7 @@ const makeMessagesSocket = (config) => {
         jids = deduplicateLidPnJids(Array.from(new Set(jids)))
         const jidsWithUser = jids
             .map(jid => {
-            const decoded = WABinary_1.jidDecode(jid)
+            const decoded = jidDecode(jid)
             const user = decoded?.user
             const device = decoded?.device
             const isExplicitDevice = typeof device === 'number' && device >= 0
@@ -252,7 +296,7 @@ const makeMessagesSocket = (config) => {
                 return null
             }
             
-            jid = WABinary_1.jidNormalizedUser(jid)
+            jid = jidNormalizedUser(jid)
             return { jid, user }
         }) 
         .filter(jid => jid !== null)
@@ -270,10 +314,10 @@ const makeMessagesSocket = (config) => {
                     (userDevicesCache.mget ? undefined : (await userDevicesCache.get(user)))
                     
                 if (devices) {
-                    const isLidJid = WABinary_1.isLidUser(jid) 
+                    const isLidJid = isLidUser(jid) 
                     const devicesWithWire = devices.map(d => ({
                         ...d,
-                        wireJid: isLidJid ? WABinary_1.jidEncode(d.user, 'lid', d.device) : WABinary_1.jidEncode(d.user, 's.whatsapp.net', d.device)
+                        wireJid: isLidJid ? jidEncode(d.user, 'lid', d.device) : jidEncode(d.user, 's.whatsapp.net', d.device)
                     }))
                     
                     deviceResults.push(...devicesWithWire)
@@ -294,22 +338,22 @@ const makeMessagesSocket = (config) => {
         
         const requestedLidUsers = new Set()
         for (const jid of toFetch) {
-            if (WABinary_1.isLidUser(jid)) {
-                const user = WABinary_1.jidDecode(jid)?.user
+            if (isLidUser(jid)) {
+                const user = jidDecode(jid)?.user
                 if (user)
                     requestedLidUsers.add(user)
             }
         }
         
-        const query = new WAUSync_1.USyncQuery().withContext('message').withDeviceProtocol()
+        const query = new USyncQuery().withContext('message').withDeviceProtocol()
         for (const jid of toFetch) {
-            query.withUser(new WAUSync_1.USyncUser().withId(jid))
+            query.withUser(new USyncUser().withId(jid))
         }
         
         const result = await executeUSyncQuery(query)
         
         if (result) {
-            const extracted = Utils_1.extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
+            const extracted = extractDeviceJids(result?.list, authState.creds.me.id, ignoreZeroDevices)
             const deviceMap = {}
             
             for (const item of extracted) {
@@ -324,8 +368,8 @@ const makeMessagesSocket = (config) => {
                 // Process all devices for this user
                 for (const item of userDevices) {
                     const finalWireJid = isLidUser
-                        ? WABinary_1.jidEncode(user, 'lid', item.device)
-                        : WABinary_1.jidEncode(item.user, 's.whatsapp.net', item.device)
+                        ? jidEncode(user, 'lid', item.device)
+                        : jidEncode(item.user, 's.whatsapp.net', item.device)
                     deviceResults.push({
                         ...item,
                         wireJid: finalWireJid
@@ -394,7 +438,7 @@ const makeMessagesSocket = (config) => {
             // Group JIDs by user for bulk migration
             const userGroups = new Map()
             for (const jid of jids) {
-                const user = WABinary_1.jidNormalizedUser(jid)
+                const user = jidNormalizedUser(jid)
                 if (!userGroups.has(user)) {
                     userGroups.set(user, [])
                 }
@@ -403,7 +447,7 @@ const makeMessagesSocket = (config) => {
             
             // Helper to check LID mapping for a user
             const checkUserLidMapping = async (user, userJids) => {
-                if (!userJids.some(jid => WABinary_1.isJidUser(jid))) {
+                if (!userJids.some(jid => isJidUser(jid))) {
                     return { shouldMigrate: false, lidForPN: undefined }
                 }
                 
@@ -462,8 +506,8 @@ const makeMessagesSocket = (config) => {
                     
                     // Determine correct JID to fetch (LID if mapping exists, otherwise original)
                     if (jid.includes('@s.whatsapp.net') && shouldMigrateUser && lidForPN) {
-                        const decoded = WABinary_1.jidDecode(jid)
-                        const lidDeviceJid = decoded.device !== undefined ? `${WABinary_1.jidDecode(lidForPN).user}:${decoded.device}@lid` : lidForPN
+                        const decoded = jidDecode(jid)
+                        const lidDeviceJid = decoded.device !== undefined ? `${jidDecode(lidForPN).user}:${decoded.device}@lid` : lidForPN
                         
                         jidsRequiringFetch.push(lidDeviceJid)
                         logger.debug({ pnJid: jid, lidJid: lidDeviceJid }, 'Adding LID JID to fetch list (conversion)')
@@ -487,13 +531,13 @@ const makeMessagesSocket = (config) => {
             const pnUsersBeingFetched = new Set()
             
             for (const jid of jidsRequiringFetch) {
-                const user = WABinary_1.jidDecode(jid)?.user
+                const user = jidDecode(jid)?.user
                 
                 if (user) {
-                    if (WABinary_1.isLidUser(jid)) {
+                    if (isLidUser(jid)) {
                         lidUsersBeingFetched.add(user)
                     }
-                    else if (WABinary_1.isJidUser(jid)) {
+                    else if (isJidUser(jid)) {
                         pnUsersBeingFetched.add(user)
                     }
                 }
@@ -514,7 +558,7 @@ const makeMessagesSocket = (config) => {
                 attrs: {
                     xmlns: 'encrypt',
                     type: 'get',
-                    to: WABinary_1.S_WHATSAPP_NET
+                    to: S_WHATSAPP_NET
                 },
                 content: [
                     {
@@ -528,7 +572,7 @@ const makeMessagesSocket = (config) => {
                 ]
             })
             
-            await Utils_1.parseAndInjectE2ESessions(result, signalRepository)
+            await parseAndInjectE2ESessions(result, signalRepository)
             didFetchNewSession = true
         }
         return didFetchNewSession
@@ -538,17 +582,17 @@ const makeMessagesSocket = (config) => {
     const sendPeerDataOperationMessage = async (pdoMessage) => {
         //TODO: for later, abstract the logic to send a Peer Message instead of just PDO - useful for App State Key Resync with phone
         if (!authState.creds.me?.id) {
-            throw new boom_1.Boom('Not authenticated')
+            throw new Boom('Not authenticated')
         }
 
         const protocolMessage = {
             protocolMessage: {
                 peerDataOperationRequestMessage: pdoMessage,
-                type: WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
+                type: proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_MESSAGE
             }
         }
 
-        const meJid = WABinary_1.jidNormalizedUser(authState.creds.me.id)
+        const meJid = jidNormalizedUser(authState.creds.me.id)
 
         const msgId = await relayMessage(meJid, protocolMessage, {
             additionalAttributes: {
@@ -561,73 +605,6 @@ const makeMessagesSocket = (config) => {
         return msgId
     }
 
-const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
-  const map = {};
-  const mutex = (key, fn) => {
-    map[key] ??= { task: Promise.resolve() };
-    map[key].task = (async prev => {
-      try { await prev } catch {}
-      return fn();
-    })(map[key].task);
-    return map[key].task;
-  };
-
-  const bokep = buf => Buffer.concat([Buffer.from(buf), Buffer.alloc(8, 1)]);
-
-  return (async () => {
-    if (!recipientJids.length)
-      return { nodes: [], shouldIncludeDeviceIdentity: false };
-
-    const patched = await (patchMessageBeforeSending?.(message, recipientJids) ?? message);
-
-	let yntkts = Utils_1.encodeWAMessage?.bind(Utils_1);
-
-    const ywdh = Array.isArray(patched)
-      ? patched
-      : recipientJids.map(jid => ({ recipientJid: jid, message: patched }));
-
-    const { id: meId, lid: meLid } = authState.creds.me;
-    const omak = meLid ? WABinary_1.jidDecode(meLid)?.user : null;
-    let shouldIncludeDeviceIdentity = false;
-
-    const nodes = await Promise.all(
-      ywdh.map(async ({ recipientJid: jid, message: msg }) => {
-        const { user: targetUser } = WABinary_1.jidDecode(jid);
-        const { user: ownPnUser } = WABinary_1.jidDecode(meId);
-        const isOwnUser = targetUser === ownPnUser || targetUser === omak;
-        const y = jid === meId || jid === meLid;
-
-        if (dsmMessage && isOwnUser && !y) msg = dsmMessage;
-
-        let bytes = bokep(yntkts ? yntkts(msg) : Utils_1.encodeWAMessage(msg));
-
-        return mutex(jid, async () => {
-          const { type, ciphertext } = await signalRepository.encryptMessage({
-            jid,
-            data: bytes
-          });
-
-          if (type === "pkmsg") shouldIncludeDeviceIdentity = true;
-
-          return {
-            tag: "to",
-            attrs: { jid },
-            content: [
-              {
-                tag: "enc",
-                attrs: { v: "2", type, ...extraAttrs },
-                content: ciphertext
-              }
-            ]
-          };
-        });
-      })
-    );
-
-    return { nodes: nodes.filter(Boolean), shouldIncludeDeviceIdentity };
-  })();
-};
-
     const createParticipantNodes = async (jids, message, extraAttrs, dsmMessage) => {
         let patched = await patchMessageBeforeSending(message, jids)
         
@@ -639,7 +616,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
         
         const meId = authState.creds.me.id
         const meLid = authState.creds.me?.lid
-        const meLidUser = meLid ? WABinary_1.jidDecode(meLid)?.user : null
+        const meLidUser = meLid ? jidDecode(meLid)?.user : null
         const devicesByUser = new Map()
         
         for (const patchedMessageWithJid of patched) {
@@ -648,7 +625,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 continue
                 
             // Extract user from JID for grouping
-            const decoded = WABinary_1.jidDecode(wireJid)
+            const decoded = jidDecode(wireJid)
             const user = decoded?.user
             
             if (!user)
@@ -668,7 +645,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             
             // Helper to get encryption JID with LID migration
             const getEncryptionJid = async (wireJid) => {
-                if (!WABinary_1.isJidUser(wireJid))
+                if (!isJidUser(wireJid))
                     return wireJid
                     
                 try {
@@ -678,16 +655,16 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                         return wireJid
                         
                     // Preserve device ID from original wire JID
-                    const wireDecoded = WABinary_1.jidDecode(wireJid)
+                    const wireDecoded = jidDecode(wireJid)
                     const deviceId = wireDecoded?.device || 0
-                    const lidDecoded = WABinary_1.jidDecode(lidForPN)
-                    const lidWithDevice = WABinary_1.jidEncode(lidDecoded?.user, 'lid', deviceId)
+                    const lidDecoded = jidDecode(lidForPN)
+                    const lidWithDevice = jidEncode(lidDecoded?.user, 'lid', deviceId)
                     
                     // Migrate session to LID for unified encryption layer
                     try {
                         const migrationResult = await signalRepository.migrateSession([wireJid], lidWithDevice)
-                        const recipientUser = WABinary_1.jidNormalizedUser(wireJid)
-                        const ownPnUser = WABinary_1.jidNormalizedUser(meId)
+                        const recipientUser = jidNormalizedUser(wireJid)
+                        const ownPnUser = jidNormalizedUser(meId)
                         const isOwnDevice = recipientUser === ownPnUser
                         logger.info({ wireJid, lidWithDevice, isOwnDevice }, 'Migrated to LID encryption')
                         
@@ -720,8 +697,8 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 let messageToEncrypt = patchedMessage
                 
                 if (dsmMessage) {
-                    const { user: targetUser } = WABinary_1.jidDecode(wireJid)
-                    const { user: ownPnUser } = WABinary_1.jidDecode(meId)
+                    const { user: targetUser } = jidDecode(wireJid)
+                    const { user: ownPnUser } = jidDecode(meId)
                     const ownLidUser = meLidUser
                     
                     // Check if this is our device (same user, different device)
@@ -736,7 +713,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     }
                 }
                 
-                const bytes = Utils_1.encodeWAMessage(messageToEncrypt)
+                const bytes = encodeWAMessage(messageToEncrypt)
                 
                 // Get encryption JID with LID migration
                 const encryptionJid = await getEncryptionJid(wireJid)
@@ -785,7 +762,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
         let didPushAdditional = false
         let shouldIncludeDeviceIdentity = false
 
-        const { user, server } = WABinary_1.jidDecode(jid)
+        const { user, server } = jidDecode(jid)
 
         const statusJid = 'status@broadcast'
         const isGroup = server === 'g.us'
@@ -808,7 +785,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             logger.debug({ to: jid, ownId }, 'Using PN identity for @s.whatsapp.net conversation')
         }
 
-        msgId = msgId || Utils_1.generateMessageID(authState.creds.me.id)
+        msgId = msgId || generateMessageID(authState.creds.me.id)
         useUserDevicesCache = useUserDevicesCache !== false
         useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
 
@@ -829,7 +806,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
 
         const regexGroupOld = /^(\d{1,15})-(\d+)@g\.us$/
 
-        const messages = Utils_1.normalizeMessageContent(message)  
+        const messages = normalizeMessageContent(message)  
 
         const buttonType = getButtonType(messages)
         const pollMessage = messages.pollCreationMessage || messages.pollCreationMessageV2 || messages.pollCreationMessageV3
@@ -843,7 +820,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 additionalAttributes = { ...additionalAttributes, 'device_fanout': 'false' }
             }
 
-            const { user, device } = WABinary_1.jidDecode(participant.jid)
+            const { user, device } = jidDecode(participant.jid)
 
             devices.push({
                 user,
@@ -902,7 +879,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     }
 
                     if (!isStatus) {
-                        const groupAddressingMode = groupData?.addressingMode || (isLid ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN)
+                        const groupAddressingMode = groupData?.addressingMode || (isLid ? WAMessageAddressingMode.LID : WAMessageAddressingMode.PN)
                         additionalAttributes = {
                             ...additionalAttributes,
                             addressing_mode: groupAddressingMode
@@ -913,8 +890,8 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     devices.push(...additionalDevices)
                 }
 
-                const patched = await patchMessageBeforeSending(message, devices.map(d => WABinary_1.jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)))                
-                const bytes = Utils_1.encodeWAMessage(patched)
+                const patched = await patchMessageBeforeSending(message, devices.map(d => jidEncode(d.user, isLid ? 'lid' : 's.whatsapp.net', d.device)))                
+                const bytes = encodeWAMessage(patched)
                 
                 // This should match the group's addressing mode and conversation context
                 const groupAddressingMode = groupData?.addressingMode || (isLid ? 'lid' : 'pn')
@@ -977,13 +954,13 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 }
 
                 // Message delete
-                if (message.protocolMessage?.type === WAProto_1.proto.Message.ProtocolMessage.Type.REVOKE) {
+                if (message.protocolMessage?.type === proto.Message.ProtocolMessage.Type.REVOKE) {
                     msgId = message.protocolMessage.key?.id
                     message = {}
                 }
 
                 const patched = await patchMessageBeforeSending(message, [])
-                const bytes = Utils_1.encodeNewsletterMessage(patched)
+                const bytes = encodeNewsletterMessage(patched)
 
                 binaryNodeContent.push({
                     tag: 'plaintext',
@@ -993,24 +970,24 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             }
 
             else {
-                const { user: ownUser } = WABinary_1.jidDecode(ownId)
+                const { user: ownUser } = jidDecode(ownId)
 
                 if (!participant) {
                     const targetUserServer = isLid ? 'lid' : 's.whatsapp.net'
                     devices.push({
                         user,
                         device: 0,
-                        wireJid: WABinary_1.jidEncode(user, targetUserServer, 0)
+                        wireJid: jidEncode(user, targetUserServer, 0)
                     })
                     
                     // Own user matches conversation addressing mode
                     if (user !== ownUser) {
                         const ownUserServer = isLid ? 'lid' : 's.whatsapp.net';
-                        const ownUserForAddressing = isLid && meLid ? WABinary_1.jidDecode(meLid).user : WABinary_1.jidDecode(meId).user
+                        const ownUserForAddressing = isLid && meLid ? jidDecode(meLid).user : jidDecode(meId).user
                         devices.push({
                             user: ownUserForAddressing,
                             device: 0,
-                            wireJid: WABinary_1.jidEncode(ownUserForAddressing, ownUserServer, 0)
+                            wireJid: jidEncode(ownUserForAddressing, ownUserServer, 0)
                         })
                     }
 
@@ -1020,15 +997,15 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                         
                         // Use conversation-appropriate sender identity
                         const senderIdentity = isLid && meLid
-                            ? WABinary_1.jidEncode(WABinary_1.jidDecode(meLid)?.user, 'lid', undefined)
-                            : WABinary_1.jidEncode(WABinary_1.jidDecode(meId)?.user, 's.whatsapp.net', undefined)
+                            ? jidEncode(jidDecode(meLid)?.user, 'lid', undefined)
+                            : jidEncode(jidDecode(meId)?.user, 's.whatsapp.net', undefined)
                             
                         // Enumerate devices for sender and target with consistent addressing
                         const sessionDevices = await getUSyncDevices([senderIdentity, jid], false, false)
                         devices.push(...sessionDevices)
                         logger.debug({
                             deviceCount: devices.length,
-                            devices: devices.map(d => `${d.user}:${d.device}@${WABinary_1.jidDecode(d.wireJid)?.server}`)
+                            devices: devices.map(d => `${d.user}:${d.device}@${jidDecode(d.wireJid)?.server}`)
                         }, 'Device enumeration complete with unified addressing')
                     }
                 }
@@ -1037,8 +1014,8 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 const meJids = []
                 const otherJids = []
                 
-                const { user: mePnUser } = WABinary_1.jidDecode(meId)
-                const { user: meLidUser } = meLid ? WABinary_1.jidDecode(meLid) : { user: null }
+                const { user: mePnUser } = jidDecode(meId)
+                const { user: meLidUser } = meLid ? jidDecode(meLid) : { user: null }
 
                 for (const { user, wireJid } of devices) {
                     const isExactSenderDevice = wireJid === meId || (meLid && wireJid === meLid)
@@ -1075,7 +1052,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 participants.push(...otherNodes)
                 
                 if (meJids.length > 0 || otherJids.length > 0) {
-                    extraAttrs['phash'] = Utils_1.generateParticipantHashV2([...meJids, ...otherJids])
+                    extraAttrs['phash'] = generateParticipantHashV2([...meJids, ...otherJids])
                 }
 
                 shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
@@ -1114,12 +1091,12 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             // ensure the message is only sent to that person
             // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
             if (participant) {
-                if (WABinary_1.isJidGroup(destinationJid)) {
+                if (isJidGroup(destinationJid)) {
                     stanza.attrs.to = destinationJid
                     stanza.attrs.participant = participant.jid
                 }
 
-                else if (WABinary_1.areJidsSameUser(participant.jid, meId)) {
+                else if (areJidsSameUser(participant.jid, meId)) {
                     stanza.attrs.to = participant.jid
                     stanza.attrs.recipient = destinationJid
                 }
@@ -1137,7 +1114,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 stanza.content.push({
                     tag: 'device-identity',
                     attrs: {},
-                    content: Utils_1.encodeSignedDeviceIdentity(authState.creds.account, true)
+                    content: encodeSignedDeviceIdentity(authState.creds.account, true)
                 })
 
                 logger.debug({ jid }, 'adding device identity')
@@ -1166,7 +1143,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
 
             if (!isNewsletter && buttonType) {
                 const buttonsNode = getButtonArgs(messages)
-                const filteredButtons = WABinary_1.getBinaryFilteredButtons(additionalNodes ? additionalNodes : [])
+                const filteredButtons = getBinaryFilteredButtons(additionalNodes ? additionalNodes : [])
 
                 if (filteredButtons) {
                    stanza.content.push(...additionalNodes)
@@ -1186,7 +1163,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     }
                 }
 
-                const filteredBizBot = WABinary_1.getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
+                const filteredBizBot = getBinaryFilteredBizBot(additionalNodes ? additionalNodes : []) 
 
                 if (filteredBizBot) {
                     stanza.content.push(...additionalNodes) 
@@ -1216,7 +1193,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
     }
 
     const getTypeMessage = (msg) => {
-        const message = Utils_1.normalizeMessageContent(msg)  
+        const message = normalizeMessageContent(msg)  
         if (message.pollCreationMessage || message.pollCreationMessageV2 || message.pollCreationMessageV3) {
             return 'poll'
         }       
@@ -1335,7 +1312,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'interactive',
@@ -1365,7 +1342,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'interactive', 
@@ -1394,7 +1371,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }, 
                 content: [{
                     tag: 'list', 
@@ -1416,19 +1393,19 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 attrs: {
                 	actual_actors: '2', 
                 	host_storage: '2', 
-                	privacy_mode_ts: Utils_1.unixTimestampSeconds().toString()
+                	privacy_mode_ts: unixTimestampSeconds().toString()
                 }
             }
         }
     }
 
     const getPrivacyTokens = async (jids) => {
-        const t = Utils_1.unixTimestampSeconds().toString()
+        const t = unixTimestampSeconds().toString()
 
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'privacy'
             },
@@ -1439,7 +1416,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     content: jids.map(jid => ({
                         tag: 'token',
                         attrs: {
-                            jid: WABinary_1.jidNormalizedUser(jid),
+                            jid: jidNormalizedUser(jid),
                             t,
                             type: 'trusted_contact'
                         }
@@ -1452,7 +1429,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
     }    
     
     const getEphemeralGroup = (jid) => {
-    	if (!WABinary_1.isJidGroup(jid)) throw new TypeError("Jid should originate from a group!") 
+    	if (!isJidGroup(jid)) throw new TypeError("Jid should originate from a group!") 
     
         return groupQuery(jid, 'get', [{
         	tag: 'query',
@@ -1460,13 +1437,13 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             	request: 'interactive'
             }
         }])
-        .then((groups) => WABinary_1.getBinaryNodeChild(groups, 'group'))
-        .then((metadata) => WABinary_1.getBinaryNodeChild(metadata, 'ephemeral')?.attrs?.expiration || 0) 
+        .then((groups) => getBinaryNodeChild(groups, 'group'))
+        .then((metadata) => getBinaryNodeChild(metadata, 'ephemeral')?.attrs?.expiration || 0) 
     }
 
-    const waUploadToServer = Utils_1.getWAUploadToServer(config, refreshMediaConn)
+    const waUploadToServer = getWAUploadToServer(config, refreshMediaConn)
 
-    const waitForMsgMediaUpdate = Utils_1.bindWaitForEvent(ev, 'messages.media-update')
+    const waitForMsgMediaUpdate = bindWaitForEvent(ev, 'messages.media-update')
     
     return {
         ...suki,
@@ -1484,13 +1461,12 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
         fetchPrivacySettings, 
         messageRetryManager, 
         createParticipantNodes, 
-        nodescall,
         sendPeerDataOperationMessage, 
         updateMediaMessage: async (message) => {
-            const content = Utils_1.assertMediaContent(message.message)
+            const content = assertMediaContent(message.message)
             const mediaKey = content.mediaKey
             const meId = authState.creds.me.id
-            const node = await Utils_1.encryptMediaRetryRequest(message.key, mediaKey, meId)
+            const node = await encryptMediaRetryRequest(message.key, mediaKey, meId)
             let error = undefined
 
             await Promise.all([
@@ -1504,17 +1480,17 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
 
                         else {
                             try {
-                                const media = await Utils_1.decryptMediaRetryData(result.media, mediaKey, result.key.id)
+                                const media = await decryptMediaRetryData(result.media, mediaKey, result.key.id)
 
-                                if (media.result !== WAProto_1.proto.MediaRetryNotification.ResultType.SUCCESS) {
-                                    const resultStr = WAProto_1.proto.MediaRetryNotification.ResultType[media.result]
+                                if (media.result !== proto.MediaRetryNotification.ResultType.SUCCESS) {
+                                    const resultStr = proto.MediaRetryNotification.ResultType[media.result]
 
-                                    throw new boom_1.Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: Utils_1.getStatusCodeForMediaRetry(media.result) || 404 })
+                                    throw new Boom(`Media re-upload failed by device (${resultStr})`, { data: media, statusCode: getStatusCodeForMediaRetry(media.result) || 404 })
                                 }
 
                                 content.directPath = media.directPath
 
-                                content.url = Utils_1.getUrlFromDirectPath(content.directPath)
+                                content.url = getUrlFromDirectPath(content.directPath)
 
                                 logger.debug({ directPath: media.directPath, key: result.key }, 'media update successful')
                             }
@@ -1540,24 +1516,24 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             return message
         },
         sendStatusMentions: async (content, jids = []) => {
-          const userJid = WABinary_1.jidNormalizedUser(authState.creds.me.id)
+          const userJid = jidNormalizedUser(authState.creds.me.id)
           let allUsers = new Set()
           allUsers.add(userJid)
 
           for (const id of jids) {
-            const isGroup = WABinary_1.isJidGroup(id) 
-            const isPrivate = WABinary_1.isJidUser(id) 
+            const isGroup = isJidGroup(id) 
+            const isPrivate = isJidUser(id) 
 
             if (isGroup) {
               try {
                 const metadata = await cachedGroupMetadata(id) || await groupMetadata(id)
-                const participants = metadata.participants.map(p => WABinary_1.jidNormalizedUser(p.id))
+                const participants = metadata.participants.map(p => jidNormalizedUser(p.id))
                 participants.forEach(jid => allUsers.add(jid))
               } catch (error) {
                 logger.error(`Error getting metadata for group ${id}: ${error}`)
               }
             } else if (isPrivate) {
-              allUsers.add(WABinary_1.jidNormalizedUser(id))
+              allUsers.add(jidNormalizedUser(id))
             }
           }
 
@@ -1597,10 +1573,10 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
           let msg
           let mediaHandle
           try {
-            msg = await Utils_1.generateWAMessage(WABinary_1.STORIES_JID, messageContent, {
+            msg = await generateWAMessage(STORIES_JID, messageContent, {
               logger,
               userJid,
-              getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+              getUrlInfo: text => getUrlInfo(text, {
                 thumbnailWidth: linkPreviewImageThumbnailWidth,
                 fetchOpts: { timeout: 3000, ...axiosOptions || {} },
                 logger,
@@ -1623,7 +1599,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             throw error
           }
 
-          await relayMessage(WABinary_1.STORIES_JID, msg.message, {
+          await relayMessage(STORIES_JID, msg.message, {
             messageId: msg.key.id,
             statusJidList: uniqueUsers, 
             additionalNodes: [
@@ -1636,7 +1612,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     attrs: {},
                     content: jids.map(jid => ({
                       tag: 'to',
-                      attrs: { jid: WABinary_1.jidNormalizedUser(jid) }
+                      attrs: { jid: jidNormalizedUser(jid) }
                     }))
                   }]
               }]
@@ -1644,8 +1620,8 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
 
           for (const id of jids) {
             try {
-              const normalizedId = WABinary_1.jidNormalizedUser(id)
-              const isPrivate = WABinary_1.isJidUser(normalizedId) 
+              const normalizedId = jidNormalizedUser(id)
+              const isPrivate = isJidUser(normalizedId) 
               const type = isPrivate ? 'statusMentionMessage' : 'groupStatusMentionMessage'
 
               const protocolMessage = {
@@ -1658,11 +1634,11 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                   }
                 },
                 messageContextInfo: {
-                  messageSecret: crypto_1.randomBytes(32)
+                  messageSecret: randomBytes(32)
                 }
               }
 
-              const statusMsg = await Utils_1.generateWAMessageFromContent(normalizedId,
+              const statusMsg = await generateWAMessageFromContent(normalizedId,
                 protocolMessage,
                 {}
               )
@@ -1680,7 +1656,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 }
               )
 
-              await Utils_1.delay(2000)
+              await delay(2000)
             } catch (error) {
               logger.error(`Error sending to ${id}: ${error}`)
             }
@@ -1693,7 +1669,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             const additionalAttributes = {}
 
             if (!options.ephemeralExpiration) {
-                if (WABinary_1.isJidGroup(jid)) {
+                if (isJidGroup(jid)) {
                     const expiration = await getEphemeralGroup(jid) 
                     options.ephemeralExpiration = expiration
                  }
@@ -1702,19 +1678,19 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             if (typeof content === 'object' &&
                 'disappearingMessagesInChat' in content &&
                 typeof content['disappearingMessagesInChat'] !== 'undefined' &&
-                WABinary_1.isJidGroup(jid)) {
+                isJidGroup(jid)) {
 
                 const { disappearingMessagesInChat } = content
 
                 const value = typeof disappearingMessagesInChat === 'boolean' ?
-                    (disappearingMessagesInChat ? Defaults_1.WA_DEFAULT_EPHEMERAL : 0) :
+                    (disappearingMessagesInChat ? WA_DEFAULT_EPHEMERAL : 0) :
                     disappearingMessagesInChat
 
                 await groupToggleEphemeral(jid, value)
             }
             
             else if (typeof content === 'object' && 'album' in content && content.album) {
-            	const albumMsg = await Utils_1.prepareAlbumMessageContent(jid, content.album, {
+            	const albumMsg = await prepareAlbumMessageContent(jid, content.album, {
             		suki: {
             			relayMessage, 
             			waUploadToServer
@@ -1724,7 +1700,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             	}) 
             
             	for (const media of albumMsg) {
-            		await Utils_1.delay(options.delay || 500) 
+            		await delay(options.delay || 500) 
             		await relayMessage(jid, media.message, { messageId: media.key.id, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList, additionalNodes: options.additionalNodes, AI: options.ai })
             	}
             
@@ -1734,10 +1710,10 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
             else {
                 let mediaHandle
 
-                const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                const fullMsg = await generateWAMessage(jid, content, {
                     logger,
                     userJid,
-                    getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+                    getUrlInfo: text => getUrlInfo(text, {
                         thumbnailWidth: linkPreviewImageThumbnailWidth,
                         fetchOpts: {
                             timeout: 3000,
@@ -1751,13 +1727,13 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                     getProfilePicUrl: profilePictureUrl,
                     getCallLink: createCallLink, 
                     upload: async (encFilePath, opts) => {
-                        const up = await waUploadToServer(encFilePath, { ...opts, newsletter: WABinary_1.isJidNewsletter(jid) })
+                        const up = await waUploadToServer(encFilePath, { ...opts, newsletter: isJidNewsletter(jid) })
                         mediaHandle = up.handle
                         return up
                     },
                     mediaCache: config.mediaCache,
                     options: config.options,
-                    messageId: Utils_1.generateMessageID(userJid), 
+                    messageId: generateMessageID(userJid), 
                     ...options,
                 })
 
@@ -1768,7 +1744,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
 
                 if (isDelete || isKeep) {
                     // if the chat is a group, and I am not the author, then delete the message as an admin
-                    if (WABinary_1.isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe || WABinary_1.isJidNewsletter(jid)) {
+                    if (isJidGroup(content.delete?.remoteJid) && !content.delete?.fromMe || isJidNewsletter(jid)) {
                         additionalAttributes.edit = '8'
                     }
 
@@ -1778,7 +1754,7 @@ const nodescall = (recipientJids, message, extraAttrs, dsmMessage) => {
                 }
 
                 else if (isEdit) {
-                    additionalAttributes.edit = WABinary_1.isJidNewsletter(jid) ? '3' : '1'
+                    additionalAttributes.edit = isJidNewsletter(jid) ? '3' : '1'
                 }
 
                 else if (isPin) {