@badzz88/baileys 8.5.3 → 8.5.4

package/engine-requirements.js

@@ -1,18 +1,10 @@
-const major = parseInt(process.versions.node.split(".")[0], 10);
+const major = parseInt(process.versions.node.split('.')[0], 10);
 
 if (major < 20) {
-  console.error(`
-━━━━━━━━━━━━━━━━━━━━━━━━━━
-🚫 Unsupported Node.js Version
-
-• Current  : v${process.versions.node}
-• Required : v20.0.0+
-
-This package uses features available only in
-Node.js 20 or newer.
-
-Please update Node.js and try again.
-━━━━━━━━━━━━━━━━━━━━━━━━━━
-`);
+  console.error(
+    `\n❌ This package requires Node.js 20+ to run reliably.\n` +
+    `   You are using Node.js ${process.versions.node}.\n` +
+    `   Please upgrade to Node.js 20+ to proceed.\n`
+  );
   process.exit(1);
-}
+}

package/lib/Defaults/index.js

@@ -26,6 +26,8 @@ exports.VERSION =
 	exports.PLACEHOLDER_MAX_AGE_SECONDS =
 	exports.STATUS_EXPIRY_SECONDS =
 	exports.WA_DEFAULT_EPHEMERAL =
+	exports.WA_ADV_HOSTED_KEY_INDEX_LIST_SIG_PREFIX =
+	exports.WA_ADV_KEY_INDEX_LIST_SIG_PREFIX =
 	exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX =
 	exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX =
 	exports.WA_ADV_DEVICE_SIG_PREFIX =
@@ -42,7 +44,8 @@ const index_js_1 = require('../../WAProto/index.js')
 const libsignal_1 = require('../Signal/libsignal')
 const browser_utils_1 = require('../Utils/browser-utils')
 const logger_1 = __importDefault(require('../Utils/logger'))
-const version = [2, 3000, 1041467552]
+
+const version = [2, 3000, 1044798975]
 exports.VERSION = version
 exports.UNAUTHORIZED_CODES = [401, 403, 419]
 exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com'
@@ -55,16 +58,19 @@ exports.WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0])
 exports.WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1])
 exports.WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5])
 exports.WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6])
+
+exports.WA_ADV_KEY_INDEX_LIST_SIG_PREFIX = Buffer.from([6, 2])
+exports.WA_ADV_HOSTED_KEY_INDEX_LIST_SIG_PREFIX = Buffer.from([6, 7])
 exports.WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60
-/** Status messages older than 24 hours are considered expired */
+
 exports.STATUS_EXPIRY_SECONDS = 24 * 60 * 60
-/** WA Web enforces a 14-day maximum age for placeholder resend requests */
+
 exports.PLACEHOLDER_MAX_AGE_SECONDS = 14 * 24 * 60 * 60
 exports.NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
 exports.DICT_VERSION = 3
 exports.KEY_BUNDLE_TYPE = Buffer.from([5])
-exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]) // last is "DICT_VERSION"
-/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
+exports.NOISE_WA_HEADER = Buffer.from([87, 65, 6, exports.DICT_VERSION]) 
+
 exports.URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g
 exports.WA_CERT_DETAILS = {
 	SERIAL: 0,
@@ -83,11 +89,10 @@ exports.PROCESSABLE_HISTORY_TYPES = [
 ]
 exports.DEFAULT_CONNECTION_CONFIG = {
 	version: version,
-	browser: browser_utils_1.Browsers.windows('Firefox'),
+	browser: browser_utils_1.Browsers.windows('Desktop'),
 	waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
 	connectTimeoutMs: 20000,
 	keepAliveIntervalMs: 30000,
-	aiLabel: true,
 	logger: logger_1.default.child({ class: 'baileys' }),
 	emitOwnEvents: true,
 	defaultQueryTimeoutMs: 60000,
@@ -168,17 +173,17 @@ exports.MEDIA_HKDF_KEY_MAPPING = {
 exports.MEDIA_KEYS = Object.keys(exports.MEDIA_PATH_MAP)
 exports.MIN_PREKEY_COUNT = 5
 exports.INITIAL_PREKEY_COUNT = 812
-exports.UPLOAD_TIMEOUT = 30000 // 30 seconds
-exports.MIN_UPLOAD_INTERVAL = 5000 // 5 seconds minimum between uploads
+exports.UPLOAD_TIMEOUT = 30000 
+exports.MIN_UPLOAD_INTERVAL = 5000 
 exports.DEFAULT_CACHE_TTLS = {
-	SIGNAL_STORE: 5 * 60, // 5 minutes
-	MSG_RETRY: 60 * 60, // 1 hour
-	CALL_OFFER: 5 * 60, // 5 minutes
-	USER_DEVICES: 5 * 60, // 5 minutes
-	GROUP_METADATA: 30 * 60, // 30 minutes
-	CALL_SESSION: 10 * 60, // 10 minutes
-	USYNC_RESULTS: 10 * 60, // 10 minutes
-	IDENTITY_PROOF: 60 * 60 // 1 hour
+	SIGNAL_STORE: 5 * 60, 
+	MSG_RETRY: 60 * 60, 
+	CALL_OFFER: 5 * 60, 
+	USER_DEVICES: 5 * 60, 
+	GROUP_METADATA: 30 * 60, 
+	CALL_SESSION: 10 * 60, 
+	USYNC_RESULTS: 10 * 60, 
+	IDENTITY_PROOF: 60 * 60 
 }
 exports.TimeMs = {
 	Second: 1000,

package/lib/Signal/Group/group_cipher.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.GroupCipher = void 0
-const Crypto_1 = require('../../Utils/crypto')
+const rb = require('whatsapp-rust-bridge')
 const sender_key_message_1 = require('./sender-key-message')
 class GroupCipher {
 	constructor(senderKeyStore, senderKeyName) {
@@ -73,15 +73,15 @@ class GroupCipher {
 	}
 	async getPlainText(iv, key, ciphertext) {
 		try {
-			return Buffer.from(Crypto_1.aesDecryptWithIV(ciphertext, key, iv))
-		} catch (e) {
+			return Buffer.from(rb.aesDecryptWithIV(ciphertext, key, iv))
+		} catch {
 			throw new Error('InvalidMessageException')
 		}
 	}
 	async getCipherText(iv, key, plaintext) {
 		try {
-			return Buffer.from(Crypto_1.aesEncrypWithIV(plaintext, key, iv))
-		} catch (e) {
+			return Buffer.from(rb.aesEncrypWithIV(plaintext, key, iv))
+		} catch {
 			throw new Error('InvalidMessageException')
 		}
 	}

package/lib/Signal/Group/keyhelper.js

@@ -55,7 +55,7 @@ exports.generateSenderKey = generateSenderKey
 exports.generateSenderKeyId = generateSenderKeyId
 exports.generateSenderSigningKey = generateSenderSigningKey
 const nodeCrypto = __importStar(require('crypto'))
-const Crypto_1 = require('../../Utils/crypto')
+const rb = require('whatsapp-rust-bridge')
 function generateSenderKey() {
 	return nodeCrypto.randomBytes(32)
 }
@@ -64,10 +64,10 @@ function generateSenderKeyId() {
 }
 function generateSenderSigningKey(key) {
 	if (!key) {
-		key = Crypto_1.Curve.generateKeyPair()
+		key = rb.generateKeyPair()
 	}
 	return {
-		public: Crypto_1.generateSignalPubKey(key.public),
-		private: Buffer.from(key.private)
+		public: Buffer.from(key.pubKey),
+		private: Buffer.from(key.privKey)
 	}
 }

package/lib/Signal/Group/sender-chain-key.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderChainKey = void 0
-const Crypto_1 = require('../../Utils/crypto')
+const rb = require('whatsapp-rust-bridge')
 const sender_message_key_1 = require('./sender-message-key')
 class SenderChainKey {
 	constructor(iteration, chainKey) {
@@ -26,7 +26,7 @@ class SenderChainKey {
 		return this.chainKey
 	}
 	getDerivative(seed, key) {
-		return Buffer.from(Crypto_1.hmacSign(seed, key))
+		return Buffer.from(rb.hmacSign(seed, key))
 	}
 }
 exports.SenderChainKey = SenderChainKey

package/lib/Signal/Group/sender-key-distribution-message.js

@@ -22,7 +22,7 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
 						? Buffer.from(distributionMessage.signingKey, 'base64')
 						: distributionMessage.signingKey
 			} catch (e) {
-				throw new Error(String(e))
+				throw e instanceof Error ? e : new Error(String(e))
 			}
 		} else {
 			const version = this.intsToByteHighAndLow(this.CURRENT_VERSION, this.CURRENT_VERSION)

package/lib/Signal/Group/sender-key-message.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderKeyMessage = void 0
-const Crypto_1 = require('../../Utils/crypto')
+const rb = require('whatsapp-rust-bridge')
 const index_js_1 = require('../../../WAProto/index.js')
 const ciphertext_message_1 = require('./ciphertext-message')
 class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
@@ -53,11 +53,11 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
 	verifySignature(signatureKey) {
 		const part1 = this.serialized.slice(0, this.serialized.length - this.SIGNATURE_LENGTH)
 		const part2 = this.serialized.slice(-1 * this.SIGNATURE_LENGTH)
-		const res = Crypto_1.Curve.verify(signatureKey, part1, part2)
+		const res = rb.verifySignature(signatureKey, part1, part2)
 		if (!res) throw new Error('Invalid signature!')
 	}
 	getSignature(signatureKey, serialized) {
-		return Buffer.from(Crypto_1.Curve.sign(signatureKey, serialized))
+		return Buffer.from(rb.calculateSignature(signatureKey, serialized))
 	}
 	serialize() {
 		return this.serialized

package/lib/Signal/Group/sender-key-record.js

@@ -36,7 +36,7 @@ class SenderKeyRecord {
 		return this.senderKeyStates.map(state => state.getStructure())
 	}
 	static deserialize(data) {
-		const str = Buffer.from(data).toString('utf-8')
+		const str = Buffer.from(data).toString('utf8')
 		const parsed = JSON.parse(str, generics_1.BufferJSON.reviver)
 		return new SenderKeyRecord(parsed)
 	}

package/lib/Signal/Group/sender-message-key.js

@@ -1,14 +1,14 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderMessageKey = void 0
-const Crypto_1 = require('../../Utils/crypto')
+const rb = require('whatsapp-rust-bridge')
 class SenderMessageKey {
 	constructor(iteration, seed) {
-		// HKDF(seed, 96, salt=0x00*32, info='WhisperGroup') → split into 3×32 byte chunks
-		const derived = Buffer.from(Crypto_1.hkdf(seed, 96, { salt: Buffer.alloc(32), info: 'WhisperGroup' }))
+		
+		const derived = Buffer.from(rb.hkdf(seed, 96, { salt: Buffer.alloc(32), info: 'WhisperGroup' }))
 		const keys = new Uint8Array(32)
-		keys.set(new Uint8Array(derived.slice(16, 32))) // bytes 16-31 of chunk 0
-		keys.set(new Uint8Array(derived.slice(32, 48)), 16) // bytes 0-15 of chunk 1
+		keys.set(new Uint8Array(derived.slice(16, 32))) 
+		keys.set(new Uint8Array(derived.slice(32, 48)), 16) 
 		this.iv = Buffer.from(derived.slice(0, 16))
 		this.cipherKey = Buffer.from(keys.buffer)
 		this.iteration = iteration

package/lib/Signal/libsignal.js

@@ -52,7 +52,7 @@ var __importStar =
 	})()
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.makeLibSignalRepository = makeLibSignalRepository
-const rb = require('../Utils/native-bridge').loadRustBridge()
+const rb = require('whatsapp-rust-bridge')
 const lru_cache_1 = require('lru-cache')
 const Utils_1 = require('../Utils')
 const WABinary_1 = require('../WABinary')
@@ -60,18 +60,18 @@ const sender_key_name_1 = require('./Group/sender-key-name')
 const sender_key_record_1 = require('./Group/sender-key-record')
 const Group_1 = require('./Group')
 const lid_mapping_1 = require('./lid-mapping')
-/** Extract identity key from PreKeyWhisperMessage for identity change detection */
+
 function extractIdentityFromPkmsg(ciphertext) {
 	try {
 		if (!ciphertext || ciphertext.length < 2) {
 			return undefined
 		}
-		// Version byte check (version 3)
+		
 		const version = ciphertext[0]
 		if ((version & 0xf) !== 3) {
 			return undefined
 		}
-		// Parse protobuf (skip version byte)
+		
 		const identityKeyArr = rb.getPreKeyMessageIdentityKey(ciphertext)
 		if (identityKeyArr) {
 			return identityKeyArr
@@ -82,17 +82,11 @@ function extractIdentityFromPkmsg(ciphertext) {
 	}
 }
 function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
-	if (!rb) {
-		throw new Error(
-			'The Signal session (Double Ratchet encryption) requires the "whatsapp-rust-bridge" native ' +
-				'module, which failed to load. Make sure it is installed: npm install whatsapp-rust-bridge@0.5.4'
-		)
-	}
 	const lidMapping = new lid_mapping_1.LIDMappingStore(auth.keys, logger, pnToLIDFunc)
 	const storage = signalStorage(auth, lidMapping)
 	const parsedKeys = auth.keys
 	const migratedSessionCache = new lru_cache_1.LRUCache({
-		ttl: 3 * 24 * 60 * 60 * 1000, // 7 days
+		ttl: 3 * 24 * 60 * 60 * 1000, 
 		ttlAutopurge: true,
 		updateAgeOnGet: true
 	})
@@ -100,7 +94,7 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 		decryptGroupMessage({ group, authorJid, msg }) {
 			const senderName = jidToSignalSenderKeyName(group, authorJid)
 			const cipher = new Group_1.GroupCipher(storage, senderName)
-			// Use transaction to ensure atomicity
+			
 			return parsedKeys.transaction(async () => {
 				return cipher.decrypt(msg)
 			}, group)
@@ -134,7 +128,7 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 		async decryptMessage({ jid, type, ciphertext }) {
 			const addr = jidToSignalProtocolAddress(jid)
 			const session = new rb.SessionCipher(storage, addr)
-			// Extract and save sender's identity key before decryption for identity change detection
+			
 			if (type === 'pkmsg') {
 				const identityKey = extractIdentityFromPkmsg(ciphertext)
 				if (identityKey) {
@@ -157,8 +151,8 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 				}
 				return result
 			}
-			// If it's not a sync message, we need to ensure atomicity
-			// For regular messages, we use a transaction to ensure atomicity
+			
+			
 			return parsedKeys.transaction(async () => {
 				return await doDecrypt()
 			}, jid)
@@ -166,7 +160,7 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 		async encryptMessage({ jid, data }) {
 			const addr = jidToSignalProtocolAddress(jid)
 			const cipher = new rb.SessionCipher(storage, addr)
-			// Use transaction to ensure atomicity
+			
 			return parsedKeys.transaction(async () => {
 				const { type: sigType, body } = await cipher.encrypt(data)
 				const type = sigType === 3 ? 'pkmsg' : 'msg'
@@ -198,25 +192,10 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 				await cipher.initOutgoing(session)
 			}, jid)
 		},
-		async getSessionInfo(jid) {
-			try {
-				const addr = jidToSignalProtocolAddress(jid)
-				const sessBytes = await storage.loadSession(addr.toString())
-				if (!sessBytes) return null
-				const session = rb.SessionRecord.deserialize(sessBytes)
-				const open = session.getOpenSession?.()
-				const baseKey = open?.indexInfo?.baseKey
-				const registrationId = open?.registrationId
-				if (!baseKey || typeof registrationId !== 'number') return null
-				return { baseKey: new Uint8Array(baseKey), registrationId }
-			} catch (error) {
-				return null
-			}
-		},
 		jidToSignalProtocolAddress(jid) {
 			return jidToSignalProtocolAddress(jid).toString()
 		},
-		// Optimized direct access to LID mapping store
+		
 		lidMapping,
 		async validateSession(jid) {
 			try {
@@ -232,28 +211,28 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 		},
 		async deleteSession(jids) {
 			if (!jids.length) return
-			// Convert JIDs to signal addresses and prepare for bulk deletion
+			
 			const sessionUpdates = {}
 			jids.forEach(jid => {
 				const addr = jidToSignalProtocolAddress(jid)
 				sessionUpdates[addr.toString()] = null
 			})
-			// Single transaction for all deletions
+			
 			return parsedKeys.transaction(async () => {
 				await auth.keys.set({ session: sessionUpdates })
 			}, `delete-${jids.length}-sessions`)
 		},
 		async migrateSession(fromJid, toJid) {
-			// TODO: use usync to handle this entire mess
+			
 			if (!fromJid || (!(0, WABinary_1.isLidUser)(toJid) && !(0, WABinary_1.isHostedLidUser)(toJid)))
 				return { migrated: 0, skipped: 0, total: 0 }
-			// Only support PN to LID migration
+			
 			if (!(0, WABinary_1.isPnUser)(fromJid) && !(0, WABinary_1.isHostedPnUser)(fromJid)) {
 				return { migrated: 0, skipped: 0, total: 1 }
 			}
 			const { user } = (0, WABinary_1.jidDecode)(fromJid)
 			logger.debug({ fromJid }, 'bulk device migration - loading all user devices')
-			// Get user's device list from storage
+			
 			const { [user]: userDevices } = await parsedKeys.get('device-list', [user])
 			if (!userDevices) {
 				return { migrated: 0, skipped: 0, total: 0 }
@@ -263,22 +242,22 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 			if (!userDevices.includes(fromDeviceStr)) {
 				userDevices.push(fromDeviceStr)
 			}
-			// Filter out cached devices before database fetch
+			
 			const uncachedDevices = userDevices.filter(device => {
 				const deviceKey = `${user}.${device}`
 				return !migratedSessionCache.has(deviceKey)
 			})
-			// Bulk check session existence only for uncached devices
+			
 			const deviceSessionKeys = uncachedDevices.map(device => `${user}.${device}`)
 			const existingSessions = await parsedKeys.get('session', deviceSessionKeys)
-			// Step 3: Convert existing sessions to JIDs (only migrate sessions that exist)
+			
 			const deviceJids = []
 			for (const [sessionKey, sessionData] of Object.entries(existingSessions)) {
 				if (sessionData) {
-					// Session exists in storage
+					
 					const deviceStr = sessionKey.split('.')[1]
 					if (!deviceStr) continue
-					const deviceNum = parseInt(deviceStr)
+					const deviceNum = parseInt(deviceStr, 10)
 					let jid = deviceNum === 0 ? `${user}@s.whatsapp.net` : `${user}:${deviceNum}@s.whatsapp.net`
 					if (deviceNum === 99) {
 						jid = `${user}:99@hosted`
@@ -295,7 +274,7 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 				},
 				'bulk device migration complete - all user devices processed'
 			)
-			// Single transaction for all migrations
+			
 			return parsedKeys.transaction(
 				async () => {
 					const migrationOps = deviceJids.map(jid => {
@@ -314,31 +293,31 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 					})
 					const totalOps = migrationOps.length
 					let migratedCount = 0
-					// Bulk fetch PN sessions - already exist (verified during device discovery)
+					
 					const pnAddrStrings = Array.from(new Set(migrationOps.map(op => op.fromAddr.toString())))
 					const pnSessions = await parsedKeys.get('session', pnAddrStrings)
-					// Prepare bulk session updates (PN → LID migration + deletion)
+					
 					const sessionUpdates = {}
 					for (const op of migrationOps) {
 						const pnAddrStr = op.fromAddr.toString()
 						const lidAddrStr = op.toAddr.toString()
 						const pnSession = pnSessions[pnAddrStr]
 						if (pnSession) {
-							// Session exists (guaranteed from device discovery)
+							
 							const fromSession = rb.SessionRecord.deserialize(pnSession)
 							if (fromSession.haveOpenSession()) {
-								// Queue for bulk update: copy to LID, delete from PN
+								
 								sessionUpdates[lidAddrStr] = fromSession.serialize()
 								sessionUpdates[pnAddrStr] = null
 								migratedCount++
 							}
 						}
 					}
-					// Single bulk session update for all migrations
+					
 					if (Object.keys(sessionUpdates).length > 0) {
 						await parsedKeys.set({ session: sessionUpdates })
 						logger.debug({ migratedSessions: migratedCount }, 'bulk session migration complete')
-						// Cache device-level migrations
+						
 						for (const op of migrationOps) {
 							if (sessionUpdates[op.toAddr.toString()]) {
 								const deviceKey = `${op.pnUser}.${op.deviceId}`
@@ -374,12 +353,12 @@ const jidToSignalSenderKeyName = (group, user) => {
 	return new sender_key_name_1.SenderKeyName(group, jidToSignalProtocolAddress(user))
 }
 function signalStorage({ creds, keys }, lidMapping) {
-	// Shared function to resolve PN signal address to LID if mapping exists
+	
 	const resolveLIDSignalAddress = async id => {
 		if (id.includes('.')) {
 			const [deviceId, device] = id.split('.')
 			const [user, domainType_] = deviceId.split('_')
-			const domainType = parseInt(domainType_ || '0')
+			const domainType = parseInt(domainType_ || '0', 10)
 			if (
 				domainType === WABinary_1.WAJIDDomains.LID ||
 				domainType === WABinary_1.WAJIDDomains.HOSTED_LID ||
@@ -403,22 +382,22 @@ function signalStorage({ creds, keys }, lidMapping) {
 				const fetched = await keys.get('session', keysToFetch)
 				const sess = fetched[wireJid] || fetched[id]
 				if (!sess) return null
-				// Detect old libsignal-node JSON format → treat as no session
+				
 				if (typeof sess === 'object' && !Buffer.isBuffer(sess) && !ArrayBuffer.isView(sess) && sess._sessions) {
 					return null
 				}
-				// Return raw bytes — Rust storage adapter expects Uint8Array, not SessionRecord object
+				
 				return Buffer.isBuffer(sess) ? sess : Buffer.from(sess)
-			} catch (e) {
+			} catch {
 				return null
 			}
 		},
 		storeSession: async (id, session) => {
-			// Store under raw ID so it's always findable regardless of LID mapping state
+			
 			await keys.set({ session: { [id]: session.serialize() } })
 		},
 		isTrustedIdentity: () => {
-			return true // TOFU - Trust on First Use (same as WhatsApp Web)
+			return true 
 		},
 		loadIdentityKey: async id => {
 			const wireJid = await resolveLIDSignalAddress(id)
@@ -433,7 +412,7 @@ function signalStorage({ creds, keys }, lidMapping) {
 				existingKey.length === identityKey.length &&
 				existingKey.every((byte, i) => byte === identityKey[i])
 			if (existingKey && !keysMatch) {
-				// Identity changed - clear session and update key
+				
 				await keys.set({
 					session: { [wireJid]: null },
 					'identity-key': { [wireJid]: identityKey }
@@ -441,7 +420,7 @@ function signalStorage({ creds, keys }, lidMapping) {
 				return true
 			}
 			if (!existingKey) {
-				// New contact - Trust on First Use (TOFU)
+				
 				await keys.set({ 'identity-key': { [wireJid]: identityKey } })
 				return true
 			}
@@ -462,7 +441,8 @@ function signalStorage({ creds, keys }, lidMapping) {
 			const key = creds.signedPreKey
 			return {
 				privKey: Buffer.from(key.keyPair.private),
-				pubKey: Buffer.from(key.keyPair.public)
+				pubKey: Buffer.from(key.keyPair.public),
+				signature: key.signature ? Buffer.from(key.signature) : undefined
 			}
 		},
 		loadSenderKey: async senderKeyName => {

package/lib/Signal/lid-mapping.js

@@ -6,7 +6,7 @@ const WABinary_1 = require('../WABinary')
 class LIDMappingStore {
 	constructor(keys, logger, pnToLIDFunc) {
 		this.mappingCache = new lru_cache_1.LRUCache({
-			ttl: 3 * 24 * 60 * 60 * 1000, // 7 days
+			ttl: 3 * 24 * 60 * 60 * 1000, 
 			ttlAutopurge: true,
 			updateAgeOnGet: true
 		})
@@ -20,12 +20,10 @@ class LIDMappingStore {
 		if (pairs.length === 0) return
 		const validatedPairs = []
 		for (const { lid, pn } of pairs) {
-			if (
-				!(
-					((0, WABinary_1.isLidUser)(lid) && (0, WABinary_1.isPnUser)(pn)) ||
-					((0, WABinary_1.isPnUser)(lid) && (0, WABinary_1.isLidUser)(pn))
-				)
-			) {
+			if (!(
+				((0, WABinary_1.isLidUser)(lid) && (0, WABinary_1.isPnUser)(pn)) ||
+				((0, WABinary_1.isPnUser)(lid) && (0, WABinary_1.isLidUser)(pn))
+			)) {
 				this.logger.warn(`Invalid LID-PN mapping: ${lid}, ${pn}`)
 				continue
 			}
@@ -77,7 +75,7 @@ class LIDMappingStore {
 		await this.keys.transaction(async () => {
 			await this.keys.set({ 'lid-mapping': batchData })
 		}, 'lid-mapping')
-		// Update cache after successful DB write
+		
 		for (const [pnUser, lidUser] of Object.entries(pairMap)) {
 			this.mappingCache.set(`pn:${pnUser}`, lidUser)
 			this.mappingCache.set(`lid:${lidUser}`, pnUser)
@@ -86,6 +84,26 @@ class LIDMappingStore {
 	async getLIDForPN(pn) {
 		return (await this.getLIDsForPNs([pn]))?.[0]?.lid || null
 	}
+	
+	
+	async getStoredLIDForPN(pn) {
+		if (!(0, WABinary_1.isPnUser)(pn) && !(0, WABinary_1.isHostedPnUser)(pn)) return null
+		const decoded = (0, WABinary_1.jidDecode)(pn)
+		if (!decoded) return null
+		const pnUser = decoded.user
+		let lidUser = this.mappingCache.get(`pn:${pnUser}`)
+		if (!lidUser || typeof lidUser !== 'string') {
+			const stored = await this.keys.get('lid-mapping', [pnUser])
+			lidUser = stored[pnUser]
+			if (lidUser && typeof lidUser === 'string') {
+				this.mappingCache.set(`pn:${pnUser}`, lidUser)
+				this.mappingCache.set(`lid:${lidUser}`, pnUser)
+			}
+		}
+		if (!lidUser || typeof lidUser !== 'string') return null
+		const pnDevice = decoded.device !== undefined ? decoded.device : 0
+		return `${lidUser}${!!pnDevice ? `:${pnDevice}` : ``}@${decoded.server === 'hosted' ? 'hosted.lid' : 'lid'}`
+	}
 	async getLIDsForPNs(pns) {
 		if (pns.length === 0) return null
 		const sortedPns = [...new Set(pns)].sort()
@@ -113,7 +131,7 @@ class LIDMappingStore {
 				this.logger.warn(`Invalid or empty LID user for PN ${pn}: lidUser = "${lidUser}"`)
 				return false
 			}
-			// Push the PN device ID to the LID to maintain device separation
+			
 			const pnDevice = decoded.device !== undefined ? decoded.device : 0
 			const deviceSpecificLid = `${normalizedLidUser}${!!pnDevice ? `:${pnDevice}` : ``}@${decoded.server === 'hosted' ? 'hosted.lid' : 'lid'}`
 			this.logger.trace(`getLIDForPN: ${pn} → ${deviceSpecificLid} (user mapping with device ${pnDevice})`)
@@ -168,7 +186,7 @@ class LIDMappingStore {
 			}
 		}
 		if (Object.keys(usyncFetch).length > 0) {
-			const result = await this.pnToLIDFunc?.(Object.keys(usyncFetch)) // this function already adds LIDs to mapping
+			const result = await this.pnToLIDFunc?.(Object.keys(usyncFetch)) 
 			if (result && result.length > 0) {
 				await this.storeLIDPNMappings(result)
 				for (const pair of result) {

package/lib/Socket/aigroups.js

@@ -10,7 +10,7 @@ const makeAIGroupsSocket = config => {
 	const sock = (0, groups_1.makeGroupsSocket)(config)
 	const { ev, query } = sock
 
-	/** Query helper for AI groups (w:gp2 namespace) */
+	
 	const aiGroupQuery = async (jid, type, content) =>
 		query({
 			tag: 'iq',
@@ -27,7 +27,7 @@ const makeAIGroupsSocket = config => {
 		return (0, exports.extractAIGroupMetadata)(result)
 	}
 
-	// Handle incoming w:gp2 notifications (create, promote, remove, add)
+	
 	sock.ws.on('CB:notification,w:gp2', async node => {
 		const { attrs, content } = node
 		if (!Array.isArray(content) || content.length === 0) return
@@ -44,12 +44,12 @@ const makeAIGroupsSocket = config => {
 		if (!groupId) return
 
 		if (tag === 'create') {
-			// New AI group created — emit groups.upsert
+			
 			try {
 				const meta = await aiGroupMetadata(groupId)
 				ev.emit('groups.upsert', [meta])
 			} catch {
-				// metadata fetch may fail; emit minimal info
+				
 				ev.emit('groups.upsert', [{ id: groupId }])
 			}
 		} else if (tag === 'promote' || tag === 'demote' || tag === 'remove' || tag === 'add') {
@@ -189,7 +189,7 @@ const makeAIGroupsSocket = config => {
 exports.makeAIGroupsSocket = makeAIGroupsSocket
 
 const extractAIGroupMetadata = result => {
-	// IQ response nests group inside create node: result → create → group
+	
 	const createNode = (0, WABinary_1.getBinaryNodeChild)(result, 'create')
 	const group =
 		(0, WABinary_1.getBinaryNodeChild)(createNode || result, 'group') ||