@badzz88/baileys 8.4.9 → 8.5.0

package/{src → lib}/Defaults/index.js

@@ -26,8 +26,6 @@ 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 =
@@ -44,8 +42,7 @@ 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'))
-// [major, 3000, client_revision] — client_revision is fetched from web.whatsapp.com/sw.js
-const version = [2, 3000, 1043437050]
+const version = [2, 3000, 1041467552]
 exports.VERSION = version
 exports.UNAUTHORIZED_CODES = [401, 403, 419]
 exports.DEFAULT_ORIGIN = 'https://web.whatsapp.com'
@@ -58,9 +55,6 @@ 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])
-// Prefix for the key-index-list ADV signature (CompanionDeviceAdvUtil, C08C.A0J / A0K)
-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
@@ -93,6 +87,7 @@ exports.DEFAULT_CONNECTION_CONFIG = {
 	waWebSocketUrl: 'wss://web.whatsapp.com/ws/chat',
 	connectTimeoutMs: 20000,
 	keepAliveIntervalMs: 30000,
+	aiLabel: true,
 	logger: logger_1.default.child({ class: 'baileys' }),
 	emitOwnEvents: true,
 	defaultQueryTimeoutMs: 60000,
@@ -108,12 +103,6 @@ exports.DEFAULT_CONNECTION_CONFIG = {
 		return syncType !== index_js_1.proto.HistorySync.HistorySyncType.FULL
 	},
 	shouldIgnoreJid: () => false,
-	// NOT IMPLEMENTED: receiving interop messages (BirdyChat/Haiket) is not yet supported.
-	// The interop bridge only establishes a Signal session with device 0 (the primary phone).
-	// Companion devices (any device != 0) never receive interop messages directly — no fan-out.
-	// masqueradeAsPrimary: true only works when Baileys is registered as the primary (no phone).
-	// With an existing phone account the server rejects it (401) because the noise key is bound
-	// to a companion slot and cannot be re-mapped to device 0 after registration.
 	masqueradeAsPrimary: false,
 	linkPreviewImageThumbnailWidth: 192,
 	transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },

package/{src → lib}/Signal/Group/group_cipher.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.GroupCipher = void 0
-const rb = require('whatsapp-rust-bridge-baron')
+const Crypto_1 = require('../../Utils/crypto')
 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(rb.aesDecryptWithIV(ciphertext, key, iv))
-		} catch {
+			return Buffer.from(Crypto_1.aesDecryptWithIV(ciphertext, key, iv))
+		} catch (e) {
 			throw new Error('InvalidMessageException')
 		}
 	}
 	async getCipherText(iv, key, plaintext) {
 		try {
-			return Buffer.from(rb.aesEncrypWithIV(plaintext, key, iv))
-		} catch {
+			return Buffer.from(Crypto_1.aesEncrypWithIV(plaintext, key, iv))
+		} catch (e) {
 			throw new Error('InvalidMessageException')
 		}
 	}

package/{src → lib}/Signal/Group/keyhelper.js

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

package/{src → lib}/Signal/Group/sender-chain-key.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderChainKey = void 0
-const rb = require('whatsapp-rust-bridge-baron')
+const Crypto_1 = require('../../Utils/crypto')
 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(rb.hmacSign(seed, key))
+		return Buffer.from(Crypto_1.hmacSign(seed, key))
 	}
 }
 exports.SenderChainKey = SenderChainKey

package/{src → 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 e instanceof Error ? e : new Error(String(e))
+				throw new Error(String(e))
 			}
 		} else {
 			const version = this.intsToByteHighAndLow(this.CURRENT_VERSION, this.CURRENT_VERSION)

package/{src → lib}/Signal/Group/sender-key-message.js

@@ -1,7 +1,7 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderKeyMessage = void 0
-const rb = require('whatsapp-rust-bridge-baron')
+const Crypto_1 = require('../../Utils/crypto')
 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 = rb.verifySignature(signatureKey, part1, part2)
+		const res = Crypto_1.Curve.verify(signatureKey, part1, part2)
 		if (!res) throw new Error('Invalid signature!')
 	}
 	getSignature(signatureKey, serialized) {
-		return Buffer.from(rb.calculateSignature(signatureKey, serialized))
+		return Buffer.from(Crypto_1.Curve.sign(signatureKey, serialized))
 	}
 	serialize() {
 		return this.serialized

package/{src → 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('utf8')
+		const str = Buffer.from(data).toString('utf-8')
 		const parsed = JSON.parse(str, generics_1.BufferJSON.reviver)
 		return new SenderKeyRecord(parsed)
 	}

package/{src → lib}/Signal/Group/sender-message-key.js

@@ -1,11 +1,11 @@
 'use strict'
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.SenderMessageKey = void 0
-const rb = require('whatsapp-rust-bridge-baron')
+const Crypto_1 = require('../../Utils/crypto')
 class SenderMessageKey {
 	constructor(iteration, seed) {
 		// HKDF(seed, 96, salt=0x00*32, info='WhisperGroup') → split into 3×32 byte chunks
-		const derived = Buffer.from(rb.hkdf(seed, 96, { salt: Buffer.alloc(32), info: 'WhisperGroup' }))
+		const derived = Buffer.from(Crypto_1.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

package/{src → lib}/Signal/libsignal.js

@@ -52,7 +52,7 @@ var __importStar =
 	})()
 Object.defineProperty(exports, '__esModule', { value: true })
 exports.makeLibSignalRepository = makeLibSignalRepository
-const rb = require('whatsapp-rust-bridge-baron')
+const rb = require('../Utils/native-bridge').loadRustBridge()
 const lru_cache_1 = require('lru-cache')
 const Utils_1 = require('../Utils')
 const WABinary_1 = require('../WABinary')
@@ -82,6 +82,12 @@ 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
@@ -192,6 +198,21 @@ 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()
 		},
@@ -257,7 +278,7 @@ function makeLibSignalRepository(auth, logger, pnToLIDFunc) {
 					// Session exists in storage
 					const deviceStr = sessionKey.split('.')[1]
 					if (!deviceStr) continue
-					const deviceNum = parseInt(deviceStr, 10)
+					const deviceNum = parseInt(deviceStr)
 					let jid = deviceNum === 0 ? `${user}@s.whatsapp.net` : `${user}:${deviceNum}@s.whatsapp.net`
 					if (deviceNum === 99) {
 						jid = `${user}:99@hosted`
@@ -358,7 +379,7 @@ function signalStorage({ creds, keys }, lidMapping) {
 		if (id.includes('.')) {
 			const [deviceId, device] = id.split('.')
 			const [user, domainType_] = deviceId.split('_')
-			const domainType = parseInt(domainType_ || '0', 10)
+			const domainType = parseInt(domainType_ || '0')
 			if (
 				domainType === WABinary_1.WAJIDDomains.LID ||
 				domainType === WABinary_1.WAJIDDomains.HOSTED_LID ||
@@ -388,7 +409,7 @@ function signalStorage({ creds, keys }, lidMapping) {
 				}
 				// Return raw bytes — Rust storage adapter expects Uint8Array, not SessionRecord object
 				return Buffer.isBuffer(sess) ? sess : Buffer.from(sess)
-			} catch {
+			} catch (e) {
 				return null
 			}
 		},
@@ -441,8 +462,7 @@ function signalStorage({ creds, keys }, lidMapping) {
 			const key = creds.signedPreKey
 			return {
 				privKey: Buffer.from(key.keyPair.private),
-				pubKey: Buffer.from(key.keyPair.public),
-				signature: key.signature ? Buffer.from(key.signature) : undefined
+				pubKey: Buffer.from(key.keyPair.public)
 			}
 		},
 		loadSenderKey: async senderKeyName => {