lordceaser-baileys 2.0.38 → 2.0.39

package/lib/Utils/crypto.d.ts

@@ -1,37 +1,41 @@
-import type { KeyPair } from '../Types/index.js';
-export { md5, hkdf } from 'whatsapp-rust-bridge';
+/// <reference types="node" />
+import { KeyPair } from '../Types';
 /** prefix version byte to the pub keys, required for some curve crypto functions */
-export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array<ArrayBufferLike> | Buffer<ArrayBufferLike>;
+export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array | Buffer;
 export declare const Curve: {
     generateKeyPair: () => KeyPair;
-    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer<ArrayBuffer>;
-    sign: (privateKey: Uint8Array, buf: Uint8Array) => Uint8Array<ArrayBufferLike>;
+    sharedKey: (privateKey: Uint8Array, publicKey: Uint8Array) => Buffer;
+    sign: (privateKey: Uint8Array, buf: Uint8Array) => any;
     verify: (pubKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
 };
 export declare const signedKeyPair: (identityKeyPair: KeyPair, keyId: number) => {
     keyPair: KeyPair;
-    signature: Uint8Array<ArrayBufferLike>;
+    signature: any;
     keyId: number;
 };
 /**
  * encrypt AES 256 GCM;
  * where the tag tag is suffixed to the ciphertext
  * */
-export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesEncryptGCM(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer<ArrayBuffer>;
-export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer<ArrayBuffer>;
-export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesDecryptGCM(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array, additionalData: Uint8Array): Buffer;
+export declare function aesEncryptCTR(plaintext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
+export declare function aesDecryptCTR(ciphertext: Uint8Array, key: Uint8Array, iv: Uint8Array): Buffer;
 /** decrypt AES 256 CBC; where the IV is prefixed to the buffer */
-export declare function aesDecrypt(buffer: Uint8Array, key: Uint8Array): Buffer<ArrayBuffer>;
+export declare function aesDecrypt(buffer: Buffer, key: Buffer): Buffer;
 /** decrypt AES 256 CBC */
-export declare function aesDecryptWithIV(buffer: Uint8Array, key: Uint8Array, IV: Uint8Array): Buffer<ArrayBuffer>;
-export declare function aesEncrypt(buffer: Uint8Array, key: Uint8Array): Buffer<ArrayBuffer>;
-export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer<ArrayBuffer>;
-export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): Buffer<ArrayBufferLike>;
-export declare function sha256(buffer: Buffer): Buffer<ArrayBufferLike>;
+export declare function aesDecryptWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function aesEncrypt(buffer: Buffer | Uint8Array, key: Buffer): Buffer;
+export declare function aesEncrypWithIV(buffer: Buffer, key: Buffer, IV: Buffer): Buffer;
+export declare function hmacSign(buffer: Buffer | Uint8Array, key: Buffer | Uint8Array, variant?: 'sha256' | 'sha512'): Buffer;
+export declare function sha256(buffer: Buffer): Buffer;
+export declare function md5(buffer: Buffer): Buffer;
+export declare function hkdf(buffer: Uint8Array | Buffer, expandedLength: number, info: {
+    salt?: Buffer;
+    info?: string;
+}): Buffer;
 export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>;
-//# sourceMappingURL=crypto.d.ts.map

package/lib/Utils/crypto.js

@@ -1,14 +1,46 @@
-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;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.derivePairingCodeKey = exports.hkdf = exports.md5 = exports.sha256 = exports.hmacSign = exports.aesEncrypWithIV = exports.aesEncrypt = exports.aesDecryptWithIV = exports.aesDecrypt = exports.aesDecryptCTR = exports.aesEncryptCTR = exports.aesDecryptGCM = exports.aesEncryptGCM = exports.signedKeyPair = exports.Curve = exports.generateSignalPubKey = void 0;
+const crypto_1 = require("crypto");
+const futoin_hkdf_1 = __importDefault(require("futoin-hkdf"));
+const libsignal = __importStar(require("libsignal"));
+const util_1 = require("util");
+const Defaults_1 = require("../Defaults");
+const pbkdf2Promise = (0, util_1.promisify)(crypto_1.pbkdf2);
 /** 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 = {
+const generateSignalPubKey = (pubKey) => (pubKey.length === 33
+    ? pubKey
+    : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey]));
+exports.generateSignalPubKey = generateSignalPubKey;
+exports.Curve = {
     generateKeyPair: () => {
-        const { pubKey, privKey } = curve.generateKeyPair();
+        const { pubKey, privKey } = libsignal.curve.generateKeyPair();
         return {
             private: Buffer.from(privKey),
             // remove version byte
@@ -16,13 +48,13 @@ export const Curve = {
         };
     },
     sharedKey: (privateKey, publicKey) => {
-        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
+        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
         return Buffer.from(shared);
     },
-    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
+    sign: (privateKey, buf) => (libsignal.curve.calculateSignature(privateKey, buf)),
     verify: (pubKey, message, signature) => {
         try {
-            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
+            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -30,28 +62,30 @@ export const Curve = {
         }
     }
 };
-export const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = Curve.generateKeyPair();
-    const pubKey = generateSignalPubKey(preKey.public);
-    const signature = Curve.sign(identityKeyPair.private, pubKey);
+const signedKeyPair = (identityKeyPair, keyId) => {
+    const preKey = exports.Curve.generateKeyPair();
+    const pubKey = (0, exports.generateSignalPubKey)(preKey.public);
+    const signature = exports.Curve.sign(identityKeyPair.private, pubKey);
     return { keyPair: preKey, signature, keyId };
 };
+exports.signedKeyPair = signedKeyPair;
 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);
+function aesEncryptGCM(plaintext, key, iv, additionalData) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
     cipher.setAAD(additionalData);
     return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
 }
+exports.aesEncryptGCM = aesEncryptGCM;
 /**
  * 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);
+function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+    const decipher = (0, crypto_1.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);
@@ -60,59 +94,60 @@ export function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-export function aesEncryptCTR(plaintext, key, iv) {
-    const cipher = createCipheriv('aes-256-ctr', key, iv);
+exports.aesDecryptGCM = aesDecryptGCM;
+function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-export function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = createDecipheriv('aes-256-ctr', key, iv);
+exports.aesEncryptCTR = aesEncryptCTR;
+function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
     return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
 }
+exports.aesDecryptCTR = aesDecryptCTR;
 /** 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 aesDecrypt(buffer, key) {
+    return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
 }
+exports.aesDecrypt = aesDecrypt;
 /** decrypt AES 256 CBC */
-export function aesDecryptWithIV(buffer, key, IV) {
-    const aes = createDecipheriv('aes-256-cbc', key, IV);
+function aesDecryptWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]);
 }
+exports.aesDecryptWithIV = aesDecryptWithIV;
 // 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);
+function aesEncrypt(buffer, key) {
+    const IV = (0, crypto_1.randomBytes)(16);
+    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
+exports.aesEncrypt = aesEncrypt;
 // encrypt AES 256 CBC with a given IV
-export function aesEncrypWithIV(buffer, key, IV) {
-    const aes = createCipheriv('aes-256-cbc', key, IV);
+function aesEncrypWithIV(buffer, key, IV) {
+    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
     return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
 }
+exports.aesEncrypWithIV = aesEncrypWithIV;
 // sign HMAC using SHA 256
-export function hmacSign(buffer, key, variant = 'sha256') {
-    return createHmac(variant, key).update(buffer).digest();
+function hmacSign(buffer, key, variant = 'sha256') {
+    return (0, crypto_1.createHmac)(variant, key).update(buffer).digest();
+}
+exports.hmacSign = hmacSign;
+function sha256(buffer) {
+    return (0, crypto_1.createHash)('sha256').update(buffer).digest();
+}
+exports.sha256 = sha256;
+function md5(buffer) {
+    return (0, crypto_1.createHash)('md5').update(buffer).digest();
 }
-export function sha256(buffer) {
-    return createHash('sha256').update(buffer).digest();
+exports.md5 = md5;
+// HKDF key expansion
+function hkdf(buffer, expandedLength, info) {
+    return (0, futoin_hkdf_1.default)(!Buffer.isBuffer(buffer) ? Buffer.from(buffer) : buffer, expandedLength, info);
 }
-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);
+exports.hkdf = hkdf;
+async function derivePairingCodeKey(pairingCode, salt) {
+    return await pbkdf2Promise(pairingCode, salt, 2 << 16, 32, 'sha256');
 }
-//# sourceMappingURL=crypto.js.map
+exports.derivePairingCodeKey = derivePairingCodeKey;

package/lib/Utils/decode-wa-message.d.ts

@@ -1,66 +1,20 @@
-import type { WAMessage } from '../Types/index.js';
-import type { SignalRepositoryWithLIDStore } from '../Types/Signal.js';
-import { type BinaryNode } from '../WABinary/index.js';
-import type { ILogger } from './logger.js';
-export declare const getDecryptionJid: (sender: string, repository: SignalRepositoryWithLIDStore) => Promise<string>;
+import { Logger } from 'pino';
+import { proto } from '../../WAProto';
+import { SignalRepository } from '../Types';
+import { BinaryNode } from '../WABinary';
 export declare const NO_MESSAGE_FOUND_ERROR_TEXT = "Message absent from node";
-export declare const MISSING_KEYS_ERROR_TEXT = "Key used already or never filled";
-export declare const ACCOUNT_RESTRICTED_TEXT = "Your account has been restricted";
-export declare const DECRYPTION_RETRY_CONFIG: {
-    maxRetries: number;
-    baseDelayMs: number;
-    sessionRecordErrors: string[];
-};
-/** NACK reason codes we send to the server (client → server) */
-export declare const NACK_REASONS: {
-    SenderReachoutTimelocked: number;
-    ParsingError: number;
-    UnrecognizedStanza: number;
-    UnrecognizedStanzaClass: number;
-    UnrecognizedStanzaType: number;
-    InvalidProtobuf: number;
-    InvalidHostedCompanionStanza: number;
-    MissingMessageSecret: number;
-    SignalErrorOldCounter: number;
-    MessageDeletedOnPeer: number;
-    UnhandledError: number;
-    UnsupportedAdminRevoke: number;
-    UnsupportedLIDGroup: number;
-    DBOperationFailed: number;
-};
-/**
- * Server-side error codes returned in ack stanzas (server → client) that we
- * currently have dedicated handlers for. Extend as more handlers are added.
- * Distinct from the client-side NackReason enum (WAWebCreateNackFromStanza).
- */
-export declare const SERVER_ERROR_CODES: {
-    /**
-     * 1:1 message missing privacy token (tctoken). Usually means the account is
-     * restricted: WhatsApp blocks starting new chats but preserves existing ones,
-     * since established chats already carry a tctoken.
-     */
-    readonly MessageAccountRestriction: "463";
-    /** Stanza validation failure (SMAX_INVALID) — likely stale device session */
-    readonly SmaxInvalid: "479";
-};
-export declare const extractAddressingContext: (stanza: BinaryNode) => {
-    addressingMode: string;
-    senderAlt: string | undefined;
-    recipientAlt: string | undefined;
-};
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
 export declare function decodeMessageNode(stanza: BinaryNode, meId: string, meLid: string): {
-    fullMessage: WAMessage;
+    fullMessage: proto.IWebMessageInfo;
     author: string;
     sender: string;
 };
-export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepositoryWithLIDStore, logger: ILogger) => {
-    fullMessage: WAMessage;
-    category: string | undefined;
+export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: Logger) => {
+    fullMessage: proto.IWebMessageInfo;
+    category: string;
     author: string;
     decrypt(): Promise<void>;
 };
-//# sourceMappingURL=decode-wa-message.d.ts.map