@badzz88/baileys 8.4.7 → 8.5.0

package/lib/Utils/noise-handler.js

@@ -1,201 +1,196 @@
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/index.js';
-import { NOISE_MODE, WA_CERT_DETAILS } from '../Defaults/index.js';
-import { decodeBinaryNode } from '../WABinary/index.js';
-import { aesDecryptGCM, aesEncryptGCM, Curve, hkdf, sha256 } from './crypto.js';
-const IV_LENGTH = 12;
-const EMPTY_BUFFER = Buffer.alloc(0);
-const generateIV = (counter) => {
-    const iv = new ArrayBuffer(IV_LENGTH);
-    new DataView(iv).setUint32(8, counter);
-    return new Uint8Array(iv);
-};
-class TransportState {
-    constructor(encKey, decKey) {
-        this.encKey = encKey;
-        this.decKey = decKey;
-        this.readCounter = 0;
-        this.writeCounter = 0;
-        this.iv = new Uint8Array(IV_LENGTH);
-    }
-    encrypt(plaintext) {
-        const c = this.writeCounter++;
-        this.iv[8] = (c >>> 24) & 0xff;
-        this.iv[9] = (c >>> 16) & 0xff;
-        this.iv[10] = (c >>> 8) & 0xff;
-        this.iv[11] = c & 0xff;
-        return aesEncryptGCM(plaintext, this.encKey, this.iv, EMPTY_BUFFER);
-    }
-    decrypt(ciphertext) {
-        const c = this.readCounter++;
-        this.iv[8] = (c >>> 24) & 0xff;
-        this.iv[9] = (c >>> 16) & 0xff;
-        this.iv[10] = (c >>> 8) & 0xff;
-        this.iv[11] = c & 0xff;
-        return aesDecryptGCM(ciphertext, this.decKey, this.iv, EMPTY_BUFFER);
-    }
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.makeNoiseHandler = void 0
+const boom_1 = require('@hapi/boom')
+const index_js_1 = require('../../WAProto/index.js')
+const Defaults_1 = require('../Defaults')
+const rb = require('./native-bridge').loadRustBridge()
+
+// rustNodeToJs mirrors the one in decode.js — converts InternalBinaryNode to plain JS object
+const rustNodeToJs = node => {
+	if (!node || typeof node !== 'object') return node
+	const result = { tag: node.tag, attrs: node.attrs || {} }
+	const content = node.content
+	if (content === undefined || content === null) {
+		// no content
+	} else if (content instanceof Uint8Array) {
+		result.content = Buffer.from(content)
+	} else if (typeof content === 'string') {
+		result.content = content
+	} else if (Array.isArray(content)) {
+		result.content = content.map(rustNodeToJs)
+	} else {
+		result.content = content
+	}
+	return result
 }
-export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
-    logger = logger.child({ class: 'ns' });
-    const data = Buffer.from(NOISE_MODE);
-    let hash = data.byteLength === 32 ? data : sha256(data);
-    let salt = hash;
-    let encKey = hash;
-    let decKey = hash;
-    let counter = 0;
-    let sentIntro = false;
-    let inBytes = Buffer.alloc(0);
-    let transport = null;
-    let isWaitingForTransport = false;
-    let pendingOnFrame = null;
-    let introHeader;
-    if (routingInfo) {
-        introHeader = Buffer.alloc(7 + routingInfo.byteLength + NOISE_HEADER.length);
-        introHeader.write('ED', 0, 'utf8');
-        introHeader.writeUint8(0, 2);
-        introHeader.writeUint8(1, 3);
-        introHeader.writeUint8(routingInfo.byteLength >> 16, 4);
-        introHeader.writeUint16BE(routingInfo.byteLength & 65535, 5);
-        introHeader.set(routingInfo, 7);
-        introHeader.set(NOISE_HEADER, 7 + routingInfo.byteLength);
-    }
-    else {
-        introHeader = Buffer.from(NOISE_HEADER);
-    }
-    const authenticate = (data) => {
-        if (!transport) {
-            hash = sha256(Buffer.concat([hash, data]));
-        }
-    };
-    const encrypt = (plaintext) => {
-        if (transport) {
-            return transport.encrypt(plaintext);
-        }
-        const result = aesEncryptGCM(plaintext, encKey, generateIV(counter++), hash);
-        authenticate(result);
-        return result;
-    };
-    const decrypt = (ciphertext) => {
-        if (transport) {
-            return transport.decrypt(ciphertext);
-        }
-        const result = aesDecryptGCM(ciphertext, decKey, generateIV(counter++), hash);
-        authenticate(ciphertext);
-        return result;
-    };
-    const localHKDF = (data) => {
-        const key = hkdf(Buffer.from(data), 64, { salt, info: '' });
-        return [key.subarray(0, 32), key.subarray(32)];
-    };
-    const mixIntoKey = (data) => {
-        const [write, read] = localHKDF(data);
-        salt = write;
-        encKey = read;
-        decKey = read;
-        counter = 0;
-    };
-    const finishInit = async () => {
-        isWaitingForTransport = true;
-        const [write, read] = localHKDF(new Uint8Array(0));
-        transport = new TransportState(write, read);
-        isWaitingForTransport = false;
-        logger.trace('Noise handler transitioned to Transport state');
-        if (pendingOnFrame) {
-            logger.trace({ length: inBytes.length }, 'Flushing buffered frames after transport ready');
-            await processData(pendingOnFrame);
-            pendingOnFrame = null;
-        }
-    };
-    const processData = async (onFrame) => {
-        let size;
-        while (true) {
-            if (inBytes.length < 3)
-                return;
-            size = (inBytes[0] << 16) | (inBytes[1] << 8) | inBytes[2];
-            if (inBytes.length < size + 3)
-                return;
-            let frame = inBytes.subarray(3, size + 3);
-            inBytes = inBytes.subarray(size + 3);
-            if (transport) {
-                const result = transport.decrypt(frame);
-                frame = await decodeBinaryNode(result);
-            }
-            if (logger.level === 'trace') {
-                logger.trace({ msg: frame?.attrs?.id }, 'recv frame');
-            }
-            onFrame(frame);
-        }
-    };
-    authenticate(NOISE_HEADER);
-    authenticate(publicKey);
-    return {
-        encrypt,
-        decrypt,
-        authenticate,
-        mixIntoKey,
-        finishInit,
-        processHandshake: ({ serverHello }, noiseKey) => {
-            authenticate(serverHello.ephemeral);
-            mixIntoKey(Curve.sharedKey(privateKey, serverHello.ephemeral));
-            const decStaticContent = decrypt(serverHello.static);
-            mixIntoKey(Curve.sharedKey(privateKey, decStaticContent));
-            const certDecoded = decrypt(serverHello.payload);
-            const { intermediate: certIntermediate, leaf } = proto.CertChain.decode(certDecoded);
-            // leaf
-            if (!leaf?.details || !leaf?.signature) {
-                throw new Boom('invalid noise leaf certificate', { statusCode: 400 });
-            }
-            if (!certIntermediate?.details || !certIntermediate?.signature) {
-                throw new Boom('invalid noise intermediate certificate', { statusCode: 400 });
-            }
-            const details = proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-            const { issuerSerial } = details;
-            const verify = Curve.verify(details.key, leaf.details, leaf.signature);
-            const verifyIntermediate = Curve.verify(WA_CERT_DETAILS.PUBLIC_KEY, certIntermediate.details, certIntermediate.signature);
-            if (!verify) {
-                throw new Boom('noise certificate signature invalid', { statusCode: 400 });
-            }
-            if (!verifyIntermediate) {
-                throw new Boom('noise intermediate certificate signature invalid', { statusCode: 400 });
-            }
-            if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
-                throw new Boom('certification match failed', { statusCode: 400 });
-            }
-            const keyEnc = encrypt(noiseKey.public);
-            mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
-            return keyEnc;
-        },
-        encodeFrame: (data) => {
-            if (transport) {
-                data = transport.encrypt(data);
-            }
-            const dataLen = data.byteLength;
-            const introSize = sentIntro ? 0 : introHeader.length;
-            const frame = Buffer.allocUnsafe(introSize + 3 + dataLen);
-            if (!sentIntro) {
-                frame.set(introHeader);
-                sentIntro = true;
-            }
-            frame[introSize] = (dataLen >>> 16) & 0xff;
-            frame[introSize + 1] = (dataLen >>> 8) & 0xff;
-            frame[introSize + 2] = dataLen & 0xff;
-            frame.set(data, introSize + 3);
-            return frame;
-        },
-        decodeFrame: async (newData, onFrame) => {
-            if (isWaitingForTransport) {
-                inBytes = Buffer.concat([inBytes, newData]);
-                pendingOnFrame = onFrame;
-                return;
-            }
-            if (inBytes.length === 0) {
-                inBytes = Buffer.from(newData);
-            }
-            else {
-                inBytes = Buffer.concat([inBytes, newData]);
-            }
-            await processData(onFrame);
-        }
-    };
-};
-//# sourceMappingURL=noise-handler.js.map
+
+const makeNoiseHandler = ({
+	keyPair: { private: privateKey, public: publicKey },
+	NOISE_HEADER,
+	logger,
+	routingInfo
+}) => {
+	logger = logger.child({ class: 'ns' })
+
+	if (!rb) {
+		throw new Error(
+			'Establishing a WhatsApp connection requires the "whatsapp-rust-bridge" native module ' +
+				'(Noise protocol handshake + session), which failed to load. Make sure it is installed: ' +
+				'npm install whatsapp-rust-bridge@0.5.4'
+		)
+	}
+
+	const session = new rb.NoiseSession(
+		publicKey instanceof Uint8Array ? publicKey : new Uint8Array(publicKey),
+		NOISE_HEADER instanceof Uint8Array ? NOISE_HEADER : new Uint8Array(NOISE_HEADER),
+		routingInfo ? (routingInfo instanceof Uint8Array ? routingInfo : new Uint8Array(routingInfo)) : undefined
+	)
+
+	let isWaitingForTransport = false
+	let pendingOnFrame = null
+	let pendingBytes = null
+
+	const processFrames = async onFrame => {
+		// decodeFrame returns an Array of InternalBinaryNode (post-handshake) or Uint8Array (handshake)
+		const frames = session.decodeFrame(new Uint8Array(0))
+		for (let i = 0; i < frames.length; i++) {
+			const item = frames[i]
+			let frame
+			if (item instanceof Uint8Array) {
+				frame = Buffer.from(item)
+			} else {
+				try {
+					frame = rustNodeToJs(item.toJSON())
+				} catch (decodeErr) {
+					logger.debug({ err: decodeErr?.message }, '[noise] decode error')
+					continue
+				}
+			}
+			if (logger.level === 'trace') {
+				logger.trace({ msg: frame?.attrs?.id }, 'recv frame')
+			}
+			onFrame(frame)
+		}
+	}
+
+	const finishInit = async () => {
+		isWaitingForTransport = true
+		session.finishInit()
+		isWaitingForTransport = false
+		logger.trace('Noise handler transitioned to Transport state (Rust)')
+		if (pendingOnFrame && pendingBytes) {
+			logger.trace({ length: pendingBytes.length }, 'Flushing buffered frames after transport ready')
+			const frames = session.decodeFrame(pendingBytes)
+			pendingBytes = null
+			const cb = pendingOnFrame
+			pendingOnFrame = null
+			for (let i = 0; i < frames.length; i++) {
+				const item = frames[i]
+				let frame
+				if (item instanceof Uint8Array) {
+					frame = Buffer.from(item)
+				} else {
+					try {
+						frame = rustNodeToJs(item.toJSON())
+					} catch (e) {
+						continue
+					}
+				}
+				cb(frame)
+			}
+		}
+	}
+
+	return {
+		encrypt: plaintext => {
+			const u8 = plaintext instanceof Uint8Array ? plaintext : new Uint8Array(plaintext)
+			return Buffer.from(session.encrypt(u8))
+		},
+		decrypt: ciphertext => {
+			const u8 = ciphertext instanceof Uint8Array ? ciphertext : new Uint8Array(ciphertext)
+			return Buffer.from(session.decrypt(u8))
+		},
+		authenticate: data => {
+			session.authenticate(data instanceof Uint8Array ? data : new Uint8Array(data))
+		},
+		mixIntoKey: data => {
+			session.mixIntoKey(data instanceof Uint8Array ? data : new Uint8Array(data))
+		},
+		finishInit,
+		processHandshake: ({ serverHello }, noiseKey) => {
+			// Rust handles the crypto: authenticate ephemeral, ECDH, decrypt static+payload
+			const certPayload = session.processHandshakeInit(
+				serverHello.ephemeral,
+				serverHello.static,
+				serverHello.payload,
+				privateKey instanceof Uint8Array ? privateKey : new Uint8Array(privateKey)
+			)
+
+			// Certificate validation stays in JS (uses protobuf + WA-specific constants)
+			const { intermediate: certIntermediate, leaf } = index_js_1.proto.CertChain.decode(certPayload)
+			if (!leaf?.details || !leaf?.signature) {
+				throw new boom_1.Boom('invalid noise leaf certificate', { statusCode: 400 })
+			}
+			if (!certIntermediate?.details || !certIntermediate?.signature) {
+				throw new boom_1.Boom('invalid noise intermediate certificate', { statusCode: 400 })
+			}
+			const details = index_js_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details)
+			const { issuerSerial } = details
+			const { Curve } = require('./crypto')
+			if (!Curve.verify(details.key, leaf.details, leaf.signature)) {
+				throw new boom_1.Boom('noise certificate signature invalid', { statusCode: 400 })
+			}
+			if (!Curve.verify(Defaults_1.WA_CERT_DETAILS.PUBLIC_KEY, certIntermediate.details, certIntermediate.signature)) {
+				throw new boom_1.Boom('noise intermediate certificate signature invalid', { statusCode: 400 })
+			}
+			if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
+				throw new boom_1.Boom('certification match failed', { statusCode: 400 })
+			}
+
+			// Encrypt our static key and do final ECDH
+			const keyEnc = session.processHandshakeFinish(
+				noiseKey.public instanceof Uint8Array ? noiseKey.public : new Uint8Array(noiseKey.public),
+				noiseKey.private instanceof Uint8Array ? noiseKey.private : new Uint8Array(noiseKey.private),
+				serverHello.ephemeral
+			)
+			return Buffer.from(keyEnc)
+		},
+		encodeFrame: data => {
+			const u8 = data instanceof Uint8Array ? data : new Uint8Array(data.buffer, data.byteOffset, data.byteLength)
+			return Buffer.from(session.encodeFrameRaw(u8))
+		},
+		decodeFrame: async (newData, onFrame) => {
+			if (isWaitingForTransport) {
+				pendingBytes = pendingBytes
+					? Buffer.concat([pendingBytes, Buffer.from(newData)])
+					: Buffer.from(newData)
+				pendingOnFrame = onFrame
+				return
+			}
+
+			const u8 = newData instanceof Uint8Array ? newData : new Uint8Array(newData.buffer, newData.byteOffset, newData.byteLength)
+			const frames = session.decodeFrame(u8)
+
+			for (let i = 0; i < frames.length; i++) {
+				const item = frames[i]
+				let frame
+				if (item instanceof Uint8Array) {
+					frame = Buffer.from(item)
+				} else {
+					try {
+						frame = rustNodeToJs(item.toJSON())
+					} catch (decodeErr) {
+						logger.debug({ err: decodeErr?.message }, '[noise] decode error')
+						continue
+					}
+				}
+				if (logger.level === 'trace') {
+					logger.trace({ msg: frame?.attrs?.id }, 'recv frame')
+				}
+				onFrame(frame)
+			}
+		}
+	}
+}
+exports.makeNoiseHandler = makeNoiseHandler

package/lib/Utils/offline-node-processor.js

@@ -1,40 +1,42 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.makeOfflineNodeProcessor = makeOfflineNodeProcessor
 /**
  * Creates a processor for offline stanza nodes that:
  * - Queues nodes for sequential processing
  * - Yields to the event loop periodically to avoid blocking
  * - Catches handler errors to prevent the processing loop from crashing
  */
-export function makeOfflineNodeProcessor(nodeProcessorMap, deps, batchSize = 10) {
-    const nodes = [];
-    let isProcessing = false;
-    const enqueue = (type, node) => {
-        nodes.push({ type, node });
-        if (isProcessing) {
-            return;
-        }
-        isProcessing = true;
-        const promise = async () => {
-            let processedInBatch = 0;
-            while (nodes.length && deps.isWsOpen()) {
-                const { type, node } = nodes.shift();
-                const nodeProcessor = nodeProcessorMap.get(type);
-                if (!nodeProcessor) {
-                    deps.onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node');
-                    continue;
-                }
-                await nodeProcessor(node).catch(err => deps.onUnexpectedError(err, `processing offline ${type}`));
-                processedInBatch++;
-                // Yield to event loop after processing a batch
-                // This prevents blocking the event loop for too long when there are many offline nodes
-                if (processedInBatch >= batchSize) {
-                    processedInBatch = 0;
-                    await deps.yieldToEventLoop();
-                }
-            }
-            isProcessing = false;
-        };
-        promise().catch(error => deps.onUnexpectedError(error, 'processing offline nodes'));
-    };
-    return { enqueue };
+function makeOfflineNodeProcessor(nodeProcessorMap, deps, batchSize = 10) {
+	const nodes = []
+	let isProcessing = false
+	const enqueue = (type, node) => {
+		nodes.push({ type, node })
+		if (isProcessing) {
+			return
+		}
+		isProcessing = true
+		const promise = async () => {
+			let processedInBatch = 0
+			while (nodes.length && deps.isWsOpen()) {
+				const { type, node } = nodes.shift()
+				const nodeProcessor = nodeProcessorMap.get(type)
+				if (!nodeProcessor) {
+					deps.onUnexpectedError(new Error(`unknown offline node type: ${type}`), 'processing offline node')
+					continue
+				}
+				await nodeProcessor(node).catch(err => deps.onUnexpectedError(err, `processing offline ${type}`))
+				processedInBatch++
+				// Yield to event loop after processing a batch
+				// This prevents blocking the event loop for too long when there are many offline nodes
+				if (processedInBatch >= batchSize) {
+					processedInBatch = 0
+					await deps.yieldToEventLoop()
+				}
+			}
+			isProcessing = false
+		}
+		promise().catch(error => deps.onUnexpectedError(error, 'processing offline nodes'))
+	}
+	return { enqueue }
 }
-//# sourceMappingURL=offline-node-processor.js.map