@badzz88/baileys 8.5.7 → 8.5.8

package/lib/Utils/companion-reg-client-utils.js

@@ -1,42 +1,35 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.buildPairingQRData = exports.getCompanionPlatformId = exports.getCompanionWebClientType = exports.CompanionWebClientType = void 0
-var CompanionWebClientType
-;(function (CompanionWebClientType) {
-	CompanionWebClientType[(CompanionWebClientType['UNKNOWN'] = 0)] = 'UNKNOWN'
-	CompanionWebClientType[(CompanionWebClientType['CHROME'] = 1)] = 'CHROME'
-	CompanionWebClientType[(CompanionWebClientType['EDGE'] = 2)] = 'EDGE'
-	CompanionWebClientType[(CompanionWebClientType['FIREFOX'] = 3)] = 'FIREFOX'
-	CompanionWebClientType[(CompanionWebClientType['IE'] = 4)] = 'IE'
-	CompanionWebClientType[(CompanionWebClientType['OPERA'] = 5)] = 'OPERA'
-	CompanionWebClientType[(CompanionWebClientType['SAFARI'] = 6)] = 'SAFARI'
-	CompanionWebClientType[(CompanionWebClientType['ELECTRON'] = 7)] = 'ELECTRON'
-	CompanionWebClientType[(CompanionWebClientType['UWP'] = 8)] = 'UWP'
-	CompanionWebClientType[(CompanionWebClientType['OTHER_WEB_CLIENT'] = 9)] = 'OTHER_WEB_CLIENT'
-})((CompanionWebClientType = exports.CompanionWebClientType || (exports.CompanionWebClientType = {})))
+export var CompanionWebClientType;
+(function (CompanionWebClientType) {
+    CompanionWebClientType[CompanionWebClientType["UNKNOWN"] = 0] = "UNKNOWN";
+    CompanionWebClientType[CompanionWebClientType["CHROME"] = 1] = "CHROME";
+    CompanionWebClientType[CompanionWebClientType["EDGE"] = 2] = "EDGE";
+    CompanionWebClientType[CompanionWebClientType["FIREFOX"] = 3] = "FIREFOX";
+    CompanionWebClientType[CompanionWebClientType["IE"] = 4] = "IE";
+    CompanionWebClientType[CompanionWebClientType["OPERA"] = 5] = "OPERA";
+    CompanionWebClientType[CompanionWebClientType["SAFARI"] = 6] = "SAFARI";
+    CompanionWebClientType[CompanionWebClientType["ELECTRON"] = 7] = "ELECTRON";
+    CompanionWebClientType[CompanionWebClientType["UWP"] = 8] = "UWP";
+    CompanionWebClientType[CompanionWebClientType["OTHER_WEB_CLIENT"] = 9] = "OTHER_WEB_CLIENT";
+})(CompanionWebClientType || (CompanionWebClientType = {}));
 const BROWSER_TO_COMPANION_WEB_CLIENT = {
-	Chrome: CompanionWebClientType.CHROME,
-	Edge: CompanionWebClientType.EDGE,
-	Firefox: CompanionWebClientType.FIREFOX,
-	IE: CompanionWebClientType.IE,
-	Opera: CompanionWebClientType.OPERA,
-	Safari: CompanionWebClientType.SAFARI
-}
-const getCompanionWebClientType = ([os, browserName]) => {
-	if (browserName === 'Desktop') {
-		return os === 'Windows' ? CompanionWebClientType.UWP : CompanionWebClientType.ELECTRON
-	}
-	return BROWSER_TO_COMPANION_WEB_CLIENT[browserName] || CompanionWebClientType.OTHER_WEB_CLIENT
-}
-exports.getCompanionWebClientType = getCompanionWebClientType
-const getCompanionPlatformId = (browser) => {
-	return getCompanionWebClientType(browser).toString()
-}
-exports.getCompanionPlatformId = getCompanionPlatformId
-const buildPairingQRData = (ref, noiseKeyB64, identityKeyB64, advB64, browser) => {
-	return (
-		'https://wa.me/settings/linked_devices#' +
-		[ref, noiseKeyB64, identityKeyB64, advB64, getCompanionPlatformId(browser)].join(',')
-	)
-}
-exports.buildPairingQRData = buildPairingQRData
+    Chrome: CompanionWebClientType.CHROME,
+    Edge: CompanionWebClientType.EDGE,
+    Firefox: CompanionWebClientType.FIREFOX,
+    IE: CompanionWebClientType.IE,
+    Opera: CompanionWebClientType.OPERA,
+    Safari: CompanionWebClientType.SAFARI
+};
+export const getCompanionWebClientType = ([os, browserName]) => {
+    if (browserName === 'Desktop') {
+        return os === 'Windows' ? CompanionWebClientType.UWP : CompanionWebClientType.ELECTRON;
+    }
+    return BROWSER_TO_COMPANION_WEB_CLIENT[browserName] || CompanionWebClientType.OTHER_WEB_CLIENT;
+};
+export const getCompanionPlatformId = (browser) => {
+    return getCompanionWebClientType(browser).toString();
+};
+export const buildPairingQRData = (ref, noiseKeyB64, identityKeyB64, advB64, browser) => {
+    return ('https://wa.me/settings/linked_devices#' +
+        [ref, noiseKeyB64, identityKeyB64, advB64, getCompanionPlatformId(browser)].join(','));
+};
+//# sourceMappingURL=companion-reg-client-utils.js.map

package/lib/Utils/crypto.js

@@ -1,155 +1,118 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = exports.hkdf = exports.md5 = void 0
-exports.aesEncryptGCM = aesEncryptGCM
-exports.aesDecryptGCM = aesDecryptGCM
-exports.aesEncryptCTR = aesEncryptCTR
-exports.aesDecryptCTR = aesDecryptCTR
-exports.aesDecrypt = aesDecrypt
-exports.aesDecryptWithIV = aesDecryptWithIV
-exports.aesEncrypt = aesEncrypt
-exports.aesEncrypWithIV = aesEncrypWithIV
-exports.hmacSign = hmacSign
-exports.sha256 = sha256
-exports.derivePairingCodeKey = derivePairingCodeKey
-const { subtle } = globalThis.crypto
-const Defaults_1 = require('../Defaults')
-const nodeCrypto = require('crypto')
-
-// Pure Node.js `crypto` / hand-written JS only -- no native/WASM module
-// dependency anywhere in this file (including `Curve`, X25519 key exchange +
-// XEdDSA signing). XEdDSA specifically is validated against the official
-// RFC 8032 Ed25519 test vectors, RFC 7748-style X25519 DH vectors, and
-// hundreds of randomized Montgomery<->Edwards interop + self-consistency
-// checks -- see ./curve25519-js.js for details and references.
-
-// ── MD5 ────────────────────────────────────────────────────────────────────────
-const md5 = buffer => nodeCrypto.createHash('md5').update(buffer).digest()
-Object.defineProperty(exports, 'md5', { enumerable: true, get: () => md5 })
-
-// ── HKDF (RFC 5869) ─────────────────────────────────────────────────────────────
-const hkdfExtractJS = (salt, ikm) => nodeCrypto.createHmac('sha256', salt).update(ikm).digest()
-const hkdfExpandJS = (prk, length, info) => {
-	const hashLen = 32
-	const n = Math.ceil(length / hashLen)
-	let t = Buffer.alloc(0)
-	let okm = Buffer.alloc(0)
-	for (let i = 1; i <= n; i++) {
-		t = nodeCrypto
-			.createHmac('sha256', prk)
-			.update(Buffer.concat([t, info, Buffer.from([i])]))
-			.digest()
-		okm = Buffer.concat([okm, t])
-	}
-	return okm.subarray(0, length)
+import { createCipheriv, createDecipheriv, createHash, createHmac, randomBytes } from 'crypto';
+import * as curve from 'libsignal/src/curve.js';
+import { KEY_BUNDLE_TYPE } from '../Defaults/index.js';
+export { md5, hkdf } from 'whatsapp-rust-bridge';
+// insure browser & node compatibility
+const { subtle } = globalThis.crypto;
+/** prefix version byte to the pub keys, required for some curve crypto functions */
+export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
+export const Curve = {
+    generateKeyPair: () => {
+        const { pubKey, privKey } = curve.generateKeyPair();
+        return {
+            private: Buffer.from(privKey),
+            // remove version byte
+            public: Buffer.from(pubKey.slice(1))
+        };
+    },
+    sharedKey: (privateKey, publicKey) => {
+        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
+        return Buffer.from(shared);
+    },
+    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
+    verify: (pubKey, message, signature) => {
+        try {
+            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            return true;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+};
+export const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = Curve.generateKeyPair();
+    const pubKey = generateSignalPubKey(preKey.public);
+    const signature = Curve.sign(identityKeyPair.private, pubKey);
+    return { keyPair: preKey, signature, keyId };
+};
+const GCM_TAG_LENGTH = 128 >> 3;
+/**
+ * encrypt AES 256 GCM;
+ * where the tag tag is suffixed to the ciphertext
+ * */
+export function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = createCipheriv('aes-256-gcm', key, iv);
+    cipher.setAAD(additionalData);
+    return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
-const hkdf = (ikm, length, options = {}) => {
-	const ikmBuf = Buffer.isBuffer(ikm) ? ikm : Buffer.from(ikm)
-	const saltBuf = options.salt
-		? Buffer.isBuffer(options.salt)
-			? options.salt
-			: Buffer.from(options.salt)
-		: Buffer.alloc(32) // RFC 5869: default salt is HashLen zero bytes
-	const infoBuf = options.info
-		? Buffer.isBuffer(options.info)
-			? options.info
-			: Buffer.from(options.info)
-		: Buffer.alloc(0)
-	const prk = hkdfExtractJS(saltBuf, ikmBuf)
-	return hkdfExpandJS(prk, length, infoBuf)
+/**
+ * decrypt AES 256 GCM;
+ * where the auth tag is suffixed to the ciphertext
+ * */
+export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = createDecipheriv('aes-256-gcm', key, iv);
+    // decrypt additional adata
+    const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
+    const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
+    // set additional data
+    decipher.setAAD(additionalData);
+    decipher.setAuthTag(tag);
+    return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-Object.defineProperty(exports, 'hkdf', { enumerable: true, get: () => hkdf })
-
-// ── Signal pub key helper ─────────────────────────────────────────────────────
-const generateSignalPubKey = pubKey =>
-	pubKey.length === 33 ? pubKey : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey])
-exports.generateSignalPubKey = generateSignalPubKey
-
-// ── Curve — X25519 key exchange + XEdDSA signing ──────────────────────────────
-const curve25519JS = require('./curve25519-js')
-exports.Curve = {
-	generateKeyPair: () => curve25519JS.generateKeyPairJS(),
-	sharedKey: (privateKey, publicKey) => curve25519JS.sharedKeyJS(privateKey, publicKey),
-	sign: (privateKey, buf) => curve25519JS.signJS(privateKey, buf),
-	verify: (pubKey, message, signature) => curve25519JS.verifyJS(pubKey, message, signature)
+export function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = createCipheriv('aes-256-ctr', key, iv);
+    return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-
-const signedKeyPair = (identityKeyPair, keyId) => {
-	const preKey = exports.Curve.generateKeyPair()
-	const pubKey = generateSignalPubKey(preKey.public)
-	const signature = exports.Curve.sign(identityKeyPair.private, pubKey)
-	return { keyPair: preKey, signature, keyId }
+export function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = createDecipheriv('aes-256-ctr', key, iv);
+    return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
-exports.signedKeyPair = signedKeyPair
-
-// ── AES-256-GCM ───────────────────────────────────────────────────────────────
-function aesEncryptGCM(plaintext, key, iv, additionalData) {
-	const cipher = nodeCrypto.createCipheriv('aes-256-gcm', key, iv)
-	if (additionalData) cipher.setAAD(additionalData)
-	const encrypted = Buffer.concat([cipher.update(plaintext), cipher.final()])
-	return Buffer.concat([encrypted, cipher.getAuthTag()])
+/** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
+export function aesDecrypt(buffer, key) {
+    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
 }
-
-function aesDecryptGCM(ciphertext, key, iv, additionalData) {
-	const authTag = ciphertext.subarray(ciphertext.length - 16)
-	const encrypted = ciphertext.subarray(0, ciphertext.length - 16)
-	const decipher = nodeCrypto.createDecipheriv('aes-256-gcm', key, iv)
-	if (additionalData) decipher.setAAD(additionalData)
-	decipher.setAuthTag(authTag)
-	return Buffer.concat([decipher.update(encrypted), decipher.final()])
+/** decrypt AES 256 CBC */
+export function aesDecryptWithIV(buffer, key, IV) {
+    const aes = createDecipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([aes.update(buffer), aes.final()]);
 }
-
-// ── AES-256-CTR ───────────────────────────────────────────────────────────────
-function aesEncryptCTR(plaintext, key, iv) {
-	const cipher = nodeCrypto.createCipheriv('aes-256-ctr', key, iv)
-	return Buffer.concat([cipher.update(plaintext), cipher.final()])
+// encrypt AES 256 CBC; where a random IV is prefixed to the buffer
+export function aesEncrypt(buffer, key) {
+    const IV = randomBytes(16);
+    const aes = createCipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-
-function aesDecryptCTR(ciphertext, key, iv) {
-	const decipher = nodeCrypto.createDecipheriv('aes-256-ctr', key, iv)
-	return Buffer.concat([decipher.update(ciphertext), decipher.final()])
+// encrypt AES 256 CBC with a given IV
+export function aesEncrypWithIV(buffer, key, IV) {
+    const aes = createCipheriv('aes-256-cbc', key, IV);
+    return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
-
-// ── AES-256-CBC (no explicit IV -- zero IV, legacy/unused elsewhere in this lib) ─
-function aesDecrypt(buffer, key) {
-	return aesDecryptWithIV(buffer, key, Buffer.alloc(16))
+// sign HMAC using SHA 256
+export function hmacSign(buffer, key, variant = 'sha256') {
+    return createHmac(variant, key).update(buffer).digest();
 }
-
-function aesEncrypt(buffer, key) {
-	return aesEncrypWithIV(buffer, key, Buffer.alloc(16))
+export function sha256(buffer) {
+    return createHash('sha256').update(buffer).digest();
 }
-
-// ── AES-256-CBC (explicit IV) ─────────────────────────────────────────────────
-function aesDecryptWithIV(buffer, key, IV) {
-	const decipher = nodeCrypto.createDecipheriv('aes-256-cbc', key, IV)
-	return Buffer.concat([decipher.update(buffer), decipher.final()])
-}
-
-function aesEncrypWithIV(buffer, key, IV) {
-	const cipher = nodeCrypto.createCipheriv('aes-256-cbc', key, IV)
-	return Buffer.concat([cipher.update(buffer), cipher.final()])
-}
-
-// ── HMAC-SHA256 ───────────────────────────────────────────────────────────────
-function hmacSign(buffer, key, variant = 'sha256') {
-	return nodeCrypto.createHmac(variant, key).update(buffer).digest()
-}
-
-// ── SHA-256 ───────────────────────────────────────────────────────────────────
-function sha256(buffer) {
-	return nodeCrypto.createHash('sha256').update(buffer).digest()
-}
-
-// ── PBKDF2 pairing code key ───────────────────────────────────────────────────
-async function derivePairingCodeKey(pairingCode, salt) {
-	const encoder = new TextEncoder()
-	const pairingCodeBuffer = encoder.encode(pairingCode)
-	const saltBuffer = new Uint8Array(salt instanceof Uint8Array ? salt : new Uint8Array(salt))
-	const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits'])
-	const derivedBits = await subtle.deriveBits(
-		{ name: 'PBKDF2', salt: saltBuffer, iterations: 2 << 16, hash: 'SHA-256' },
-		keyMaterial,
-		256
-	)
-	return Buffer.from(derivedBits)
+export async function derivePairingCodeKey(pairingCode, salt) {
+    // Convert inputs to formats Web Crypto API can work with
+    const encoder = new TextEncoder();
+    const pairingCodeBuffer = encoder.encode(pairingCode);
+    const saltBuffer = new Uint8Array(salt instanceof Uint8Array ? salt : new Uint8Array(salt));
+    // Import the pairing code as key material
+    const keyMaterial = await subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, [
+        'deriveBits'
+    ]);
+    // Derive bits using PBKDF2 with the same parameters
+    // 2 << 16 = 131,072 iterations
+    const derivedBits = await subtle.deriveBits({
+        name: 'PBKDF2',
+        salt: saltBuffer,
+        iterations: 2 << 16,
+        hash: 'SHA-256'
+    }, keyMaterial, 32 * 8 // 32 bytes * 8 = 256 bits
+    );
+    return Buffer.from(derivedBits);
 }
+//# sourceMappingURL=crypto.js.map