@pontalabs/baileys 1.0.6 → 1.0.7

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

@@ -1,20 +1,20 @@
-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';
+import { proto } from '../../WAProto'
+import { KeyPair } from '../Types'
+import { BinaryNode } from '../WABinary'
+import { ILogger } from './logger'
+
 export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
-    keyPair: KeyPair;
-    NOISE_HEADER: Uint8Array;
-    logger: ILogger;
-    routingInfo?: Buffer | undefined;
+    keyPair: KeyPair
+    NOISE_HEADER: Uint8Array
+    logger: ILogger
+    routingInfo?: Buffer | undefined
 }) => {
-    encrypt: (plaintext: Uint8Array) => Uint8Array;
-    decrypt: (ciphertext: Uint8Array) => Uint8Array;
-    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>;
-};
-//# sourceMappingURL=noise-handler.d.ts.map
+    encrypt: (plaintext: Uint8Array) => Buffer
+    decrypt: (ciphertext: Uint8Array) => Buffer
+    authenticate: (data: Uint8Array) => void
+    mixIntoKey: (data: Uint8Array) => Promise<void>
+    finishInit: () => Promise<void>
+    processHandshake: ({ serverHello }: proto.HandshakeMessage, noiseKey: KeyPair) => Promise<Buffer>
+    encodeFrame: (data: Buffer | Uint8Array) => Buffer
+    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>
+}

package/lib/Utils/noise-handler.js

@@ -1,201 +1,155 @@
-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 })
+
+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);
-    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);
-    }
+    const iv = new ArrayBuffer(12)
+    new DataView(iv).setUint32(8, counter)
+    return new Uint8Array(iv)
 }
-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 makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
+    logger = logger.child({ class: 'ns' })
     const authenticate = (data) => {
-        if (!transport) {
-            hash = sha256(Buffer.concat([hash, data]));
+        if (!isFinished) {
+            hash = crypto_1.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 result = 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 = crypto_1.aesDecryptGCM(ciphertext, decKey, iv, hash)
+        if (isFinished) {
+            readCounter += 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 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;
+        else {
+            writeCounter += 1
         }
-    };
-    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);
+        authenticate(ciphertext)
+        return result
+    }
+    const localHKDF = async (data) => {
+        const key = await crypto_1.hkdf(Buffer.from(data), 64, { salt, info: '' })
+        return [key.slice(0, 32), key.slice(32)]
+    }
+    const mixIntoKey = async (data) => {
+        const [write, read] = await localHKDF(data)
+        salt = write
+        encKey = read
+        decKey = read
+        readCounter = 0
+        writeCounter = 0
+    }
+    const finishInit = async () => {
+        const [write, read] = await localHKDF(new Uint8Array(0))
+        encKey = write
+        decKey = read
+        hash = Buffer.from([])
+        readCounter = 0
+        writeCounter = 0
+        isFinished = true
+    }
+    const data = Buffer.from(Defaults_1.NOISE_MODE)
+    let hash = data.byteLength === 32 ? data : 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 {
         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 });
+        processHandshake: async ({ serverHello }, noiseKey) => {
+            authenticate(serverHello.ephemeral)
+            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral))
+            const decStaticContent = decrypt(serverHello.static)
+            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent))
+            const certDecoded = decrypt(serverHello.payload)
+            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));
-            return keyEnc;
+            const keyEnc = encrypt(noiseKey.public)
+            await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral))
+            return keyEnc
         },
         encodeFrame: (data) => {
-            if (transport) {
-                data = transport.encrypt(data);
+            if (isFinished) {
+                data = encrypt(data)
             }
-            const dataLen = data.byteLength;
-            const introSize = sentIntro ? 0 : introHeader.length;
-            const frame = Buffer.allocUnsafe(introSize + 3 + dataLen);
+            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 introSize = sentIntro ? 0 : header.length
+            const frame = Buffer.alloc(introSize + 3 + data.byteLength)
             if (!sentIntro) {
-                frame.set(introHeader);
-                sentIntro = true;
+                frame.set(header)
+                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;
+            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;
+            // 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)
+                }
             }
-            if (inBytes.length === 0) {
-                inBytes = Buffer.from(newData);
+            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 = await WABinary_1.decodeBinaryNode(result)
+                }
+                logger.trace({ msg: frame?.attrs?.id }, 'recv frame')
+                onFrame(frame)
+                size = getBytesSize()
             }
-            else {
-                inBytes = Buffer.concat([inBytes, newData]);
-            }
-            await processData(onFrame);
         }
-    };
-};
-//# sourceMappingURL=noise-handler.js.map
+    }
+}
+
+module.exports = {
+  makeNoiseHandler
+}

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

@@ -1,60 +1,49 @@
-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 { proto } from '../../WAProto'
+import { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SocketConfig } from '../Types'
+import { ILogger } from './logger'
+
 type ProcessMessageContext = {
-    shouldProcessHistoryMsg: boolean;
-    placeholderResendCache?: CacheStore;
-    creds: AuthenticationCreds;
-    keyStore: SignalKeyStoreWithTransaction;
-    ev: BaileysEventEmitter;
-    logger?: ILogger;
-    options: RequestInit;
-    signalRepository: SignalRepositoryWithLIDStore;
-    getMessage: SocketConfig['getMessage'];
-};
+    shouldProcessHistoryMsg: boolean
+    placeholderResendCache?: CacheStore
+    creds: AuthenticationCreds
+    keyStore: SignalKeyStoreWithTransaction
+    ev: BaileysEventEmitter
+    getMessage: SocketConfig['getMessage']
+    logger?: ILogger
+    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;
+    pollCreatorJid: string
     /** ID of the poll creation message */
-    pollMsgId: string;
+    pollMsgId: string
     /** poll creation message enc key */
-    pollEncKey: Uint8Array;
+    pollEncKey: Uint8Array
     /** 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;
-};
+    voterJid: 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 default processMessage;
-//# sourceMappingURL=process-message.d.ts.map
+export declare function decryptPollVote({ encPayload, encIv }: proto.Message.IPollEncValue, { pollCreatorJid, pollMsgId, pollEncKey, voterJid, }: PollContext): proto.Message.PollVoteMessage
+
+export declare const processMessage: (message: proto.IWebMessageInfo, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }: ProcessMessageContext) => Promise<void>