@neelegirl/baileys 2.1.5 → 2.1.7

package/lib/Utils/history.js

@@ -10,37 +10,72 @@ const WABinary_1 = require("../WABinary")
 const generics_1 = require("./generics")
 const messages_1 = require("./messages")
 const messages_media_1 = require("./messages-media")
-const inflatePromise = util_1.promisify(zlib_1.inflate)
+
+const inflatePromise = (0, util_1.promisify)(zlib_1.inflate)
+
+const extractPnFromMessages = (messages) => {
+    for (const msgItem of messages || []) {
+        const message = msgItem.message
+        if (!message?.key?.fromMe || !message.userReceipt?.length) {
+            continue
+        }
+        const userJid = message.userReceipt[0]?.userJid
+        if (userJid && ((0, WABinary_1.isPnUser)(userJid) || (0, WABinary_1.isHostedPnUser)(userJid))) {
+            return userJid
+        }
+    }
+}
 
 const downloadHistory = async (msg, options) => {
-    const stream = await messages_media_1.downloadContentFromMessage(msg, 'md-msg-hist', { options })
+    const stream = await (0, messages_media_1.downloadContentFromMessage)(msg, 'md-msg-hist', { options })
     const bufferArray = []
     for await (const chunk of stream) {
         bufferArray.push(chunk)
     }
     let buffer = Buffer.concat(bufferArray)
-    // decompress buffer
     buffer = await inflatePromise(buffer)
-    const syncData = WAProto_1.proto.HistorySync.decode(buffer)
-    return syncData
+    return WAProto_1.proto.HistorySync.decode(buffer)
 }
 
-const processHistoryMessage = (item) => {
+const processHistoryMessage = (item, logger) => {
     const messages = []
     const contacts = []
     const chats = []
+    const lidPnMappings = []
+    logger?.trace?.({ progress: item.progress }, `processing history of type ${item.syncType}`)
+    for (const mapping of item.phoneNumberToLidMappings || []) {
+        if (mapping.lidJid && mapping.pnJid) {
+            lidPnMappings.push({ lid: mapping.lidJid, pn: mapping.pnJid })
+        }
+    }
     switch (item.syncType) {
         case WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
         case WAProto_1.proto.HistorySync.HistorySyncType.RECENT:
         case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
         case WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND:
-            for (const chat of item.conversations) {
-                  contacts.push({
+            for (const chat of item.conversations || []) {
+                contacts.push({
                     id: chat.id,
-                    name: chat.name || undefined,
-                    lid: chat.lidJid || undefined,
-                    jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : undefined
-                });
+                    name: chat.displayName || chat.name || chat.username || undefined,
+                    lid: chat.lidJid || chat.accountLid || undefined,
+                    jid: ((0, WABinary_1.isPnUser)(chat.id) || (0, WABinary_1.isHostedPnUser)(chat.id)) ? chat.id : undefined,
+                    phoneNumber: chat.pnJid || (((0, WABinary_1.isPnUser)(chat.id) || (0, WABinary_1.isHostedPnUser)(chat.id)) ? chat.id : undefined)
+                })
+                const chatId = chat.id
+                const isLid = (0, WABinary_1.isLidUser)(chatId) || (0, WABinary_1.isHostedLidUser)(chatId)
+                const isPn = (0, WABinary_1.isPnUser)(chatId) || (0, WABinary_1.isHostedPnUser)(chatId)
+                if (isLid && chat.pnJid) {
+                    lidPnMappings.push({ lid: chatId, pn: chat.pnJid })
+                }
+                else if (isPn && chat.lidJid) {
+                    lidPnMappings.push({ lid: chat.lidJid, pn: chatId })
+                }
+                else if (isLid && !chat.pnJid) {
+                    const pnFromReceipt = extractPnFromMessages(chat.messages || [])
+                    if (pnFromReceipt) {
+                        lidPnMappings.push({ lid: chatId, pn: pnFromReceipt })
+                    }
+                }
                 const msgs = chat.messages || []
                 delete chat.messages
                 delete chat.archived
@@ -50,35 +85,33 @@ const processHistoryMessage = (item) => {
                     const message = item.message
                     messages.push(message)
                     if (!chat.messages?.length) {
-                        // keep only the most recent message in the chat array
                         chat.messages = [{ message }]
                     }
                     if (!message.key.fromMe && !chat.lastMessageRecvTimestamp) {
-                        chat.lastMessageRecvTimestamp = generics_1.toNumber(message.messageTimestamp)
+                        chat.lastMessageRecvTimestamp = (0, generics_1.toNumber)(message.messageTimestamp)
                     }
-                    if (message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP
-                        || message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB
+                    if ((message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP
+                        || message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB)
                         && message.messageStubParameters?.[0]) {
                         contacts.push({
                             id: message.key.participant || message.key.remoteJid,
-                            verifiedName: message.messageStubParameters?.[0]
+                            verifiedName: message.messageStubParameters[0]
                         })
                     }
                 }
-                if (WABinary_1.isJidUser(chat.id) && chat.readOnly && chat.archived) {
-                    delete chat.readOnly
-                }
                 chats.push({ ...chat })
             }
             break
         case WAProto_1.proto.HistorySync.HistorySyncType.PUSH_NAME:
-            for (const c of item.pushnames) {
-                contacts.push({ 
-                	id: c.id, 
-                    name: c.name || undefined, 
-                    lid: c.lidJid || undefined, 
-                    jid: WABinary_1.isJidUser(c.id) ? c.id : undefined
-                }) 
+            for (const c of item.pushnames || []) {
+                contacts.push({
+                    id: c.id,
+                    name: c.name || undefined,
+                    notify: c.pushname || undefined,
+                    lid: c.lidJid || undefined,
+                    jid: ((0, WABinary_1.isPnUser)(c.id) || (0, WABinary_1.isHostedPnUser)(c.id)) ? c.id : undefined,
+                    phoneNumber: ((0, WABinary_1.isPnUser)(c.id) || (0, WABinary_1.isHostedPnUser)(c.id)) ? c.id : undefined
+                })
             }
             break
     }
@@ -86,25 +119,31 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
+        lidPnMappings,
         syncType: item.syncType,
         progress: item.progress
     }
 }
 
-const downloadAndProcessHistorySyncNotification = async (msg, options) => {
-    const historyMsg = await downloadHistory(msg, options)
-    return processHistoryMessage(historyMsg)
+const downloadAndProcessHistorySyncNotification = async (msg, options, logger) => {
+    let historyMsg
+    if (msg.initialHistBootstrapInlinePayload) {
+        historyMsg = WAProto_1.proto.HistorySync.decode(await inflatePromise(msg.initialHistBootstrapInlinePayload))
+    }
+    else {
+        historyMsg = await downloadHistory(msg, options)
+    }
+    return processHistoryMessage(historyMsg, logger)
 }
 
 const getHistoryMsg = (message) => {
-    const normalizedContent = !!message ? messages_1.normalizeMessageContent(message) : undefined
-    const anyHistoryMsg = normalizedContent?.protocolMessage?.historySyncNotification
-    return anyHistoryMsg
+    const normalizedContent = !!message ? (0, messages_1.normalizeMessageContent)(message) : undefined
+    return normalizedContent?.protocolMessage?.historySyncNotification
 }
 
 module.exports = {
-  downloadHistory, 
-  processHistoryMessage, 
-  downloadAndProcessHistorySyncNotification, 
-  getHistoryMsg
-}
+    downloadHistory,
+    processHistoryMessage,
+    downloadAndProcessHistorySyncNotification,
+    getHistoryMsg
+}

package/lib/Utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './generics'
+export * from './browser-utils'
 export * from './decode-wa-message'
 export * from './messages'
 export * from './messages-media'
@@ -16,4 +17,6 @@ export * from './use-single-file-auth-state'
 export * from './use-multi-file-auth-state'
 export * from './link-preview'
 export * from './event-buffer'
-export * from './process-message'
+export * from './process-message'
+export * from './message-retry-manager'
+export * from './check-npm-version'

package/lib/Utils/index.js

@@ -19,6 +19,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true })
 
 __exportStar(require("./generics"), exports)
+__exportStar(require("./browser-utils"), exports)
 __exportStar(require("./decode-wa-message"), exports)
 __exportStar(require("./messages"), exports)
 __exportStar(require("./messages-media"), exports)
@@ -38,4 +39,4 @@ __exportStar(require("./link-preview"), exports)
 __exportStar(require("./event-buffer"), exports)
 __exportStar(require("./process-message"), exports)
 __exportStar(require("./message-retry-manager"), exports)
-__exportStar(require("./check-npm-version"), exports)
+__exportStar(require("./check-npm-version"), exports)

package/lib/Utils/process-message.d.ts

@@ -1,6 +1,6 @@
 import { AxiosRequestConfig } from 'axios'
 import { proto } from '../../WAProto'
-import { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SocketConfig } from '../Types'
+import { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SignalRepositoryWithLIDStore, SocketConfig } from '../Types'
 import { ILogger } from './logger'
 
 type ProcessMessageContext = {
@@ -12,6 +12,7 @@ type ProcessMessageContext = {
     getMessage: SocketConfig['getMessage']
     logger?: ILogger
     options: AxiosRequestConfig<{}>
+    signalRepository: SignalRepositoryWithLIDStore
 }
 
 /** Cleans a received message to further processing (Baileys 7.x: hosted Pn/LID + meLid) */
@@ -46,4 +47,4 @@ type PollContext = {
  */
 export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage
 
-export declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>
+export declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage, signalRepository }: ProcessMessageContext) => Promise<void>

package/lib/Utils/process-message.js

@@ -112,7 +112,7 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
     }
 }
 
-const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }) => {
+const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage, signalRepository }) => {
     const meId = creds.me.id
     const { accountSettings } = creds
     const chat = { id: WABinary_1.jidNormalizedUser(getChatId(message.key)) }
@@ -155,7 +155,12 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                             ]
                         })
                     }
-                    const data = await history_1.downloadAndProcessHistorySyncNotification(histNotification, options)
+                    const data = await history_1.downloadAndProcessHistorySyncNotification(histNotification, options, logger)
+                    if (data.lidPnMappings?.length) {
+                        logger?.debug?.({ count: data.lidPnMappings.length }, 'processing LID-PN mappings from history sync')
+                        await signalRepository?.lidMapping?.storeLIDPNMappings(data.lidPnMappings)
+                            .catch(err => logger?.warn?.({ err }, 'failed to store LID-PN mappings from history sync'))
+                    }
                     ev.emit('messaging-history.set', {
                         ...data,
                         isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
@@ -264,6 +269,27 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
                     })
                 }
                 break
+            case WAProto_1.proto.Message.ProtocolMessage.Type.LID_MIGRATION_MAPPING_SYNC:
+                const encodedPayload = protocolMsg.lidMigrationMappingSyncMessage?.encodedMappingPayload
+                if (encodedPayload?.length && signalRepository?.lidMapping) {
+                    const { pnToLidMappings, chatDbMigrationTimestamp } = WAProto_1.proto.LIDMigrationMappingSyncPayload.decode(encodedPayload)
+                    logger?.debug?.({ pnToLidMappings, chatDbMigrationTimestamp }, 'got LID migration mappings')
+                    const pairs = []
+                    for (const { pn, latestLid, assignedLid } of pnToLidMappings || []) {
+                        const lidUser = latestLid || assignedLid
+                        if (pn && lidUser) {
+                            pairs.push({
+                                lid: `${lidUser}@lid`,
+                                pn: `${pn}@s.whatsapp.net`
+                            })
+                        }
+                    }
+                    await signalRepository.lidMapping.storeLIDPNMappings(pairs)
+                    for (const { pn, lid } of pairs) {
+                        await signalRepository.migrateSession(pn, lid)
+                    }
+                }
+                break
         }
     }
     else if (content?.reactionMessage) {

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

@@ -10,7 +10,14 @@ 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 JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call' | 'lid' | 'newsletter' | 'bot' | 'hosted' | 'hosted.lid'
+
+export declare enum WAJIDDomains {
+    WHATSAPP = 0,
+    LID = 1,
+    HOSTED = 128,
+    HOSTED_LID = 129
+}
 
 export type JidWithDevice = {
     user: string
@@ -26,13 +33,21 @@ export declare const jidEncode: (user: string | number | null, server: JidServer
 
 export declare const jidDecode: (jid: string | undefined) => FullJid | undefined
 
+export declare const getServerFromDomainType: (initialServer: string, domainType?: WAJIDDomains) => JidServer
+
 /** is the jid a user */
 export declare const areJidsSameUser: (jid1: string | undefined, jid2: string | undefined) => boolean
 
-/** is the lid a user */
+/** is the jid Meta AI */
+export declare const isJidMetaAI: (jid: string | undefined) => boolean | undefined
+
+/** is the jid a PN user */
+export declare const isPnUser: (jid: string | undefined) => boolean | undefined
+
+/** backward-compatible alias */
 export declare const isJidUser: (jid: string | undefined) => boolean | undefined
 
-/** is the jid a group */
+/** is the lid a user */
 export declare const isLidUser: (jid: string | undefined) => boolean | undefined
 
 /** is the jid a broadcast */
@@ -56,4 +71,6 @@ export declare const isHostedLidUser: (jid: string | undefined) => boolean | und
 /** 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 jidNormalizedUser: (jid: string | undefined) => string
+
+export declare const transferDevice: (fromJid: string, toJid: string) => string

package/lib/WABinary/jid-utils.js

@@ -14,6 +14,27 @@ const STORIES_JID = 'status@broadcast'
 
 const META_AI_JID = '13135550002@c.us'
 
+const WAJIDDomains = {
+    WHATSAPP: 0,
+    LID: 1,
+    HOSTED: 128,
+    HOSTED_LID: 129
+}
+
+const getServerFromDomainType = (initialServer, domainType = WAJIDDomains.WHATSAPP) => {
+    switch (domainType) {
+        case WAJIDDomains.LID:
+            return 'lid'
+        case WAJIDDomains.HOSTED:
+            return 'hosted'
+        case WAJIDDomains.HOSTED_LID:
+            return 'hosted.lid'
+        case WAJIDDomains.WHATSAPP:
+        default:
+            return initialServer
+    }
+}
+
 const jidEncode = (user, server, device, agent) => {
     return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`
 }
@@ -27,10 +48,10 @@ const jidDecode = (jid) => {
     const userCombined = jid.slice(0, sepIdx)
     const [userAgent, device] = userCombined.split(':')
     const [user, agent] = (userAgent || '').split('_')
-    let domainType = 0
-    if (server === 'lid') domainType = 1
-    else if (server === 'hosted') domainType = 128
-    else if (server === 'hosted.lid') domainType = 129
+    let domainType = WAJIDDomains.WHATSAPP
+    if (server === 'lid') domainType = WAJIDDomains.LID
+    else if (server === 'hosted') domainType = WAJIDDomains.HOSTED
+    else if (server === 'hosted.lid') domainType = WAJIDDomains.HOSTED_LID
     else if (agent) domainType = parseInt(agent, 10)
     return {
         server,
@@ -45,8 +66,14 @@ 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 jid Meta AI */
+const isJidMetaAI = (jid) => jid?.endsWith('@bot')
+
+/** is the jid a PN user */
+const isPnUser = (jid) => jid?.endsWith('@s.whatsapp.net')
+
+/** backward-compatible alias */
+const isJidUser = isPnUser
 
 /** is the lid a user */
 const isLidUser = (jid) => jid?.endsWith('@lid')
@@ -82,6 +109,16 @@ const jidNormalizedUser = (jid) => {
     return jidEncode(user, server === 'c.us' ? 's.whatsapp.net' : server)
 }
 
+const transferDevice = (fromJid, toJid) => {
+    const fromDecoded = jidDecode(fromJid)
+    const deviceId = fromDecoded?.device || 0
+    const toDecoded = jidDecode(toJid)
+    if (!toDecoded) {
+        throw new Error(`invalid jid for device transfer: ${toJid}`)
+    }
+    return jidEncode(toDecoded.user, toDecoded.server, deviceId)
+}
+
 module.exports = {
   S_WHATSAPP_NET,
   OFFICIAL_BIZ_JID,
@@ -89,9 +126,13 @@ module.exports = {
   PSA_WID,
   STORIES_JID,
   META_AI_JID,
+  WAJIDDomains,
+  getServerFromDomainType,
   jidEncode,
   jidDecode,
   areJidsSameUser,
+  isJidMetaAI,
+  isPnUser,
   isJidUser,
   isLidUser,
   isJidBroadcast,
@@ -101,5 +142,6 @@ module.exports = {
   isHostedPnUser,
   isHostedLidUser,
   isJidBot,
-  jidNormalizedUser
-}
+  jidNormalizedUser,
+  transferDevice
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@neelegirl/baileys",
-  "version": "2.1.5",
-  "description": "CJS-compatible Baileys fork for Neelegirl projects, aligned with WhiskeySockets/Baileys 7.0.0-rc.9 and latest web version updates",
+  "version": "2.1.7",
+  "description": "CommonJS Neelegirl Baileys fork with preserved QR/NEELE logic and selective WhiskeySockets/Baileys compatibility updates",
   "keywords": [
     "whatsapp",
     "js-whatsapp",
@@ -11,6 +11,8 @@
     "whatsapp-group",
     "automation",
     "multi-device",
+    "commonjs",
+    "lid",
     "neelegirl",
     "baileys"
   ],
@@ -42,7 +44,7 @@
     "@adiwajshing/keyed-db": "^0.2.4",
     "@cacheable/node-cache": "^1.5.4",
     "@hapi/boom": "^9.1.3",
-    "@neelegirl/libsignal": "^1.0.9",
+    "@neelegirl/libsignal": "^1.0.11",
     "async-mutex": "^0.5.0",
     "audio-decode": "^2.1.3",
     "axios": "^1.3.3",