supunmd-bail 2.0.2 → 2.1.3

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) => Buffer<ArrayBuffer>;
-    decrypt: (ciphertext: Uint8Array) => Buffer<ArrayBuffer>;
+    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<ArrayBuffer>>;
-    encodeFrame: (data: Buffer | Uint8Array) => Buffer<ArrayBuffer>;
-    decodeFrame: (newData: Buffer | Uint8Array, onFrame: (buff: Uint8Array | BinaryNode) => void) => Promise<void>;
+    mixIntoKey: (data: Uint8Array) => 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,22 +1,25 @@
-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';
+"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(12);
     new DataView(iv).setUint32(8, counter);
     return new Uint8Array(iv);
 };
-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 authenticate = (data) => {
         if (!isFinished) {
-            hash = sha256(Buffer.concat([hash, data]));
+            hash = (0, crypto_1.sha256)(Buffer.concat([hash, data]));
         }
     };
     const encrypt = (plaintext) => {
-        const result = aesEncryptGCM(plaintext, encKey, generateIV(writeCounter), hash);
+        const result = (0, crypto_1.aesEncryptGCM)(plaintext, encKey, generateIV(writeCounter), hash);
         writeCounter += 1;
         authenticate(result);
         return result;
@@ -25,7 +28,7 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
         // before the handshake is finished, we use the same counter
         // after handshake, the counters are different
         const iv = generateIV(isFinished ? readCounter : writeCounter);
-        const result = aesDecryptGCM(ciphertext, decKey, iv, hash);
+        const result = (0, crypto_1.aesDecryptGCM)(ciphertext, decKey, iv, hash);
         if (isFinished) {
             readCounter += 1;
         }
@@ -35,20 +38,20 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
         authenticate(ciphertext);
         return result;
     };
-    const localHKDF = async (data) => {
-        const key = await hkdf(Buffer.from(data), 64, { salt, info: '' });
+    const localHKDF = (data) => {
+        const key = (0, 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);
+    const mixIntoKey = (data) => {
+        const [write, read] = localHKDF(data);
         salt = write;
         encKey = read;
         decKey = read;
         readCounter = 0;
         writeCounter = 0;
     };
-    const finishInit = async () => {
-        const [write, read] = await localHKDF(new Uint8Array(0));
+    const finishInit = () => {
+        const [write, read] = localHKDF(new Uint8Array(0));
         encKey = write;
         decKey = read;
         hash = Buffer.from([]);
@@ -56,8 +59,8 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
         writeCounter = 0;
         isFinished = true;
     };
-    const data = Buffer.from(NOISE_MODE);
-    let hash = data.byteLength === 32 ? data : sha256(data);
+    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;
@@ -74,20 +77,24 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
         authenticate,
         mixIntoKey,
         finishInit,
-        processHandshake: async ({ serverHello }, noiseKey) => {
+        processHandshake: ({ serverHello }, noiseKey) => {
             authenticate(serverHello.ephemeral);
-            await mixIntoKey(Curve.sharedKey(privateKey, serverHello.ephemeral));
+            mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral));
             const decStaticContent = decrypt(serverHello.static);
-            await 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);
-            // TODO: handle this leaf stuff
-            const { issuerSerial } = proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-            if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
-                throw new Boom('certification match failed', { statusCode: 400 });
+            if (mobile) {
+                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
+            }
+            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);
-            await mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
+            mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));
             return keyEnc;
         },
         encodeFrame: (data) => {
@@ -118,7 +125,8 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
             frame.set(data, introSize + 3);
             return frame;
         },
-        decodeFrame: async (newData, onFrame) => {
+        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
@@ -135,13 +143,13 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
                 inBytes = inBytes.slice(size + 3);
                 if (isFinished) {
                     const result = decrypt(frame);
-                    frame = await decodeBinaryNode(result);
+                    frame = (0, WABinary_1.decodeBinaryNode)(result);
                 }
-                logger.trace({ msg: frame?.attrs?.id }, 'recv frame');
+                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();
             }
         }
     };
 };
-//# sourceMappingURL=noise-handler.js.map
+exports.makeNoiseHandler = makeNoiseHandler;

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

@@ -1,25 +1,25 @@
-import { proto } from '../../WAProto/index.js';
-import type { AuthenticationCreds, BaileysEventEmitter, CacheStore, SignalKeyStoreWithTransaction, SignalRepositoryWithLIDStore, 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;
@@ -36,7 +36,6 @@ type PollContext = {
  * @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;
-declare const processMessage: (message: WAMessage, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, signalRepository, keyStore, logger, options }: 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