@alannxd/baileys 6.0.5 → 6.0.6

package/lib/Utils/noise-handler.d.ts

@@ -1,20 +1,21 @@
-import { proto } from '../../WAProto/index.js';
-import type { KeyPair } from '../Types/index.js';
-import type { BinaryNode } from '../WABinary/index.js';
-import type { ILogger } from './logger.js';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
+/// <reference types="node" />
+import { Logger } from 'pino';
+import { proto } from '../../WAProto';
+import { KeyPair } from '../Types';
+import { BinaryNode } from '../WABinary';
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
-    logger: ILogger;
+    mobile: boolean;
+    logger: Logger;
     routingInfo?: Buffer | undefined;
 }) => {
-    encrypt: (plaintext: Uint8Array) => Uint8Array;
-    decrypt: (ciphertext: Uint8Array) => Uint8Array;
+    encrypt: (plaintext: Uint8Array) => Buffer;
+    decrypt: (ciphertext: Uint8Array) => Buffer;
     authenticate: (data: Uint8Array) => void;
     mixIntoKey: (data: Uint8Array) => void;
-    finishInit: () => Promise<void>;
-    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Uint8Array<ArrayBufferLike>;
-    encodeFrame: (data: Buffer | Uint8Array) => Buffer<ArrayBuffer>;
-    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>;
+    finishInit: () => void;
+    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Buffer;
+    encodeFrame: (data: Buffer | Uint8Array) => Buffer;
+    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => void;
 };
-//# sourceMappingURL=noise-handler.d.ts.map

package/lib/Utils/noise-handler.js

@@ -1,131 +1,74 @@
-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);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeNoiseHandler = void 0;
+const boom_1 = require("@hapi/boom");
+const WAProto_1 = require("../../WAProto");
+const Defaults_1 = require("../Defaults");
+const WABinary_1 = require("../WABinary");
+const crypto_1 = require("./crypto");
 const generateIV = (counter) => {
-    const iv = new ArrayBuffer(IV_LENGTH);
+    const iv = new ArrayBuffer(12);
     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);
-    }
-}
-export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, 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]));
+        if (!isFinished) {
+            hash = (0, crypto_1.sha256)(Buffer.concat([hash, data]));
         }
     };
     const encrypt = (plaintext) => {
-        if (transport) {
-            return transport.encrypt(plaintext);
-        }
-        const result = aesEncryptGCM(plaintext, encKey, generateIV(counter++), hash);
+        const result = (0, crypto_1.aesEncryptGCM)(plaintext, encKey, generateIV(writeCounter), hash);
+        writeCounter += 1;
         authenticate(result);
         return result;
     };
     const decrypt = (ciphertext) => {
-        if (transport) {
-            return transport.decrypt(ciphertext);
+        // before the handshake is finished, we use the same counter
+        // after handshake, the counters are different
+        const iv = generateIV(isFinished ? readCounter : writeCounter);
+        const result = (0, crypto_1.aesDecryptGCM)(ciphertext, decKey, iv, hash);
+        if (isFinished) {
+            readCounter += 1;
+        }
+        else {
+            writeCounter += 1;
         }
-        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 key = (0, crypto_1.hkdf)(Buffer.from(data), 64, { salt, info: '' });
+        return [key.slice(0, 32), key.slice(32)];
     };
     const mixIntoKey = (data) => {
         const [write, read] = localHKDF(data);
         salt = write;
         encKey = read;
         decKey = read;
-        counter = 0;
+        readCounter = 0;
+        writeCounter = 0;
     };
-    const finishInit = async () => {
-        isWaitingForTransport = true;
+    const finishInit = () => {
         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);
-        }
+        encKey = write;
+        decKey = read;
+        hash = Buffer.from([]);
+        readCounter = 0;
+        writeCounter = 0;
+        isFinished = true;
     };
+    const data = Buffer.from(Defaults_1.NOISE_MODE);
+    let hash = Buffer.from(data.byteLength === 32 ? data : (0, crypto_1.sha256)(data));
+    let salt = hash;
+    let encKey = hash;
+    let decKey = hash;
+    let readCounter = 0;
+    let writeCounter = 0;
+    let isFinished = false;
+    let sentIntro = false;
+    let inBytes = Buffer.alloc(0);
     authenticate(NOISE_HEADER);
     authenticate(publicKey);
     return {
@@ -136,66 +79,77 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
         finishInit,
         processHandshake: ({ serverHello }, noiseKey) => {
             authenticate(serverHello.ephemeral);
-            mixIntoKey(Curve.sharedKey(privateKey, serverHello.ephemeral));
+            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral));
             const decStaticContent = decrypt(serverHello.static);
-            mixIntoKey(Curve.sharedKey(privateKey, decStaticContent));
+            mixIntoKey(crypto_1.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 (mobile) {
+                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
             }
-            if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
-                throw new Boom('certification match failed', { statusCode: 400 });
+            else {
+                const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
+                const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
+                if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
+                    throw new boom_1.Boom('certification match failed', { statusCode: 400 });
+                }
             }
             const keyEnc = encrypt(noiseKey.public);
-            mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
+            mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
             return keyEnc;
         },
         encodeFrame: (data) => {
-            if (transport) {
-                data = transport.encrypt(data);
+            if (isFinished) {
+                data = encrypt(data);
+            }
+            let header;
+            if (routingInfo) {
+                header = Buffer.alloc(7);
+                header.write('ED', 0, 'utf8');
+                header.writeUint8(0, 2);
+                header.writeUint8(1, 3);
+                header.writeUint8(routingInfo.byteLength >> 16, 4);
+                header.writeUint16BE(routingInfo.byteLength & 65535, 5);
+                header = Buffer.concat([header, routingInfo, NOISE_HEADER]);
+            }
+            else {
+                header = Buffer.from(NOISE_HEADER);
             }
-            const dataLen = data.byteLength;
-            const introSize = sentIntro ? 0 : introHeader.length;
-            const frame = Buffer.allocUnsafe(introSize + 3 + dataLen);
+            const introSize = sentIntro ? 0 : header.length;
+            const frame = Buffer.alloc(introSize + 3 + data.byteLength);
             if (!sentIntro) {
-                frame.set(introHeader);
+                frame.set(header);
                 sentIntro = true;
             }
-            frame[introSize] = (dataLen >>> 16) & 0xff;
-            frame[introSize + 1] = (dataLen >>> 8) & 0xff;
-            frame[introSize + 2] = dataLen & 0xff;
+            frame.writeUInt8(data.byteLength >> 16, introSize);
+            frame.writeUInt16BE(65535 & data.byteLength, introSize + 1);
             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]);
+        decodeFrame: (newData, onFrame) => {
+            var _a;
+            // the binary protocol uses its own framing mechanism
+            // on top of the WS frames
+            // so we get this data and separate out the frames
+            const getBytesSize = () => {
+                if (inBytes.length >= 3) {
+                    return (inBytes.readUInt8() << 16) | inBytes.readUInt16BE(1);
+                }
+            };
+            inBytes = Buffer.concat([inBytes, newData]);
+            logger.trace(`recv ${newData.length} bytes, total recv ${inBytes.length} bytes`);
+            let size = getBytesSize();
+            while (size && inBytes.length >= size + 3) {
+                let frame = inBytes.slice(3, size + 3);
+                inBytes = inBytes.slice(size + 3);
+                if (isFinished) {
+                    const result = decrypt(frame);
+                    frame = (0, WABinary_1.decodeBinaryNode)(result);
+                }
+                logger.trace({ msg: (_a = frame === null || frame === void 0 ? void 0 : frame.attrs) === null || _a === void 0 ? void 0 : _a.id }, 'recv frame');
+                onFrame(frame);
+                size = getBytesSize();
             }
-            await processData(onFrame);
         }
     };
 };
-//# sourceMappingURL=noise-handler.js.map
+exports.makeNoiseHandler = makeNoiseHandler;

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

@@ -1,26 +1,25 @@
-import { proto } from '../../WAProto/index.js';
-import type { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SignalRepositoryWithLIDStore, SocketConfig, WAMessage, WAMessageKey } from '../Types/index.js';
-import type { ILogger } from './logger.js';
+import { AxiosRequestConfig } from 'axios';
+import type { Logger } from 'pino';
+import { proto } from '../../WAProto';
+import { AuthenticationCreds, BaileysEventEmitter, SignalKeyStoreWithTransaction, SocketConfig } from '../Types';
 type ProcessMessageContext = {
     shouldProcessHistoryMsg: boolean;
-    placeholderResendCache?: CacheStore;
     creds: AuthenticationCreds;
     keyStore: SignalKeyStoreWithTransaction;
     ev: BaileysEventEmitter;
-    logger?: ILogger;
-    options: RequestInit;
-    signalRepository: SignalRepositoryWithLIDStore;
     getMessage: SocketConfig['getMessage'];
+    logger?: Logger;
+    options: AxiosRequestConfig<{}>;
 };
 /** Cleans a received message to further processing */
-export declare const cleanMessage: (message: WAMessage, meId: string, meLid: string) => void;
-export declare const isRealMessage: (message: WAMessage) => boolean;
-export declare const shouldIncrementChatUnread: (message: WAMessage) => boolean;
+export declare const cleanMessage: (message: proto.IWebMessageInfo, meId: string) => void;
+export declare const isRealMessage: (message: proto.IWebMessageInfo, meId: string) => boolean | undefined;
+export declare const shouldIncrementChatUnread: (message: proto.IWebMessageInfo) => boolean;
 /**
  * Get the ID of the chat from the given key.
  * Typically -- that'll be the remoteJid, but for broadcasts, it'll be the participant
  */
-export declare const getChatId: ({ remoteJid, participant, fromMe }: WAMessageKey) => string;
+export declare const getChatId: ({ remoteJid, participant, fromMe }: proto.IMessageKey) => string;
 type PollContext = {
     /** normalised jid of the person that created the poll */
     pollCreatorJid: string;
@@ -31,30 +30,12 @@ type PollContext = {
     /** jid of the person that voted */
     voterJid: string;
 };
-type EventContext = {
-    /** normalised jid of the person that created the event */
-    eventCreatorJid: string;
-    /** ID of the event creation message */
-    eventMsgId: string;
-    /** event creation message enc key */
-    eventEncKey: Uint8Array;
-    /** jid of the person that responded */
-    responderJid: string;
-};
 /**
  * Decrypt a poll vote
  * @param vote encrypted vote
  * @param ctx additional info about the poll required for decryption
  * @returns list of SHA256 options
  */
-export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid }: PollContext): proto.Message.PollVoteMessage;
-/**
- * Decrypt an event response
- * @param response encrypted event response
- * @param ctx additional info about the event required for decryption
- * @returns event response message
- */
-export declare function decryptEventResponse({ encPayload, encIv }: proto.Message.IPollEncValue, { eventCreatorJid, eventMsgId, eventEncKey, responderJid }: EventContext): proto.Message.EventResponseMessage;
-declare const processMessage: (message: WAMessage, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, signalRepository, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>;
+export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage;
+declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>;
 export default processMessage;
-//# sourceMappingURL=process-message.d.ts.map