@pontalabs/baileys 1.0.6 → 1.0.7

package/lib/Utils/crypto.d.ts

@@ -1,37 +1,56 @@
-import type { KeyPair } from '../Types/index.js';
-export { md5, hkdf } from 'whatsapp-rust-bridge';
+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>;
-    verify: (pubKey: Uint8Array, message: Uint8Array, signature: Uint8Array) => boolean;
-};
+    generateKeyPair: () => KeyPair
+    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>;
-    keyId: number;
-};
+    keyPair: KeyPair
+    signature: any
+    keyId: number
+}
+
 /**
- * encrypt AES 256 GCM;
+ * 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;
+ * 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>;
-/** 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 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: 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 derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>;
-//# sourceMappingURL=crypto.d.ts.map
+
+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
+}): Promise<Buffer>
+
+export declare function derivePairingCodeKey(pairingCode: string, salt: Buffer): Promise<Buffer>

package/lib/Utils/crypto.js

@@ -1,118 +1,189 @@
-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;
-/** 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 = {
-    generateKeyPair: () => {
-        const { pubKey, privKey } = curve.generateKeyPair();
-        return {
-            private: Buffer.from(privKey),
-            // remove version byte
-            public: Buffer.from(pubKey.slice(1))
-        };
-    },
-    sharedKey: (privateKey, publicKey) => {
-        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
-        return Buffer.from(shared);
-    },
-    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
-    verify: (pubKey, message, signature) => {
-        try {
-            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
-            return true;
-        }
-        catch (error) {
-            return false;
-        }
+"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
+}
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const crypto_1 = require("crypto")
+const libsignal = __importStar(require("libsignal"))
+const Defaults_1 = require("../Defaults")
+
+const generateSignalPubKey = (pubKey) => (
+  pubKey.length === 33 ? pubKey : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey])
+)
+
+const Curve = {
+  generateKeyPair: () => {
+    const { pubKey, privKey } = libsignal.curve.generateKeyPair()
+    return {
+      private: Buffer.from(privKey),
+      public: Buffer.from(pubKey.slice(1))
+    }
+  },
+  sharedKey: (privateKey, publicKey) => {
+    const shared = libsignal.curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey)
+    return Buffer.from(shared)
+  },
+  sign: (privateKey, buf) => libsignal.curve.calculateSignature(privateKey, buf),
+  verify: (pubKey, message, signature) => {
+    try {
+      libsignal.curve.verifySignature(generateSignalPubKey(pubKey), message, signature)
+      return true
+    } catch {
+      return false
     }
-};
-export const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = Curve.generateKeyPair();
-    const pubKey = generateSignalPubKey(preKey.public);
-    const signature = Curve.sign(identityKeyPair.private, pubKey);
-    return { keyPair: preKey, signature, keyId };
-};
-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);
-    cipher.setAAD(additionalData);
-    return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()]);
-}
-/**
- * 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);
-    // decrypt additional adata
-    const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH);
-    const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH);
-    // set additional data
-    decipher.setAAD(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);
-    return Buffer.concat([cipher.update(plaintext), cipher.final()]);
-}
-export function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = createDecipheriv('aes-256-ctr', key, iv);
-    return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
-}
-/** 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));
-}
-/** decrypt AES 256 CBC */
-export function aesDecryptWithIV(buffer, key, IV) {
-    const aes = createDecipheriv('aes-256-cbc', key, IV);
-    return Buffer.concat([aes.update(buffer), aes.final()]);
-}
-// 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);
-    return Buffer.concat([IV, aes.update(buffer), aes.final()]); // prefix IV to the buffer
-}
-// encrypt AES 256 CBC with a given IV
-export function aesEncrypWithIV(buffer, key, IV) {
-    const aes = createCipheriv('aes-256-cbc', key, IV);
-    return Buffer.concat([aes.update(buffer), aes.final()]); // prefix IV to the buffer
-}
-// sign HMAC using SHA 256
-export function hmacSign(buffer, key, variant = 'sha256') {
-    return createHmac(variant, key).update(buffer).digest();
-}
-export function sha256(buffer) {
-    return createHash('sha256').update(buffer).digest();
-}
-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);
-}
-//# sourceMappingURL=crypto.js.map
+  }
+}
+
+const signedKeyPair = (identityKeyPair, keyId) => {
+  const preKey = Curve.generateKeyPair()
+  const pubKey = generateSignalPubKey(preKey.public)
+  const signature = Curve.sign(identityKeyPair.private, pubKey)
+  return { keyPair: preKey, signature, keyId }
+}
+
+const GCM_TAG_LENGTH = 128 >> 3
+
+function aesEncryptGCM(plaintext, key, iv, additionalData) {
+  const cipher = crypto_1.createCipheriv('aes-256-gcm', key, iv)
+  cipher.setAAD(additionalData)
+  return Buffer.concat([cipher.update(plaintext), cipher.final(), cipher.getAuthTag()])
+}
+
+function aesDecryptGCM(ciphertext, key, iv, additionalData) {
+  const decipher = crypto_1.createDecipheriv('aes-256-gcm', key, iv)
+  const enc = ciphertext.slice(0, ciphertext.length - GCM_TAG_LENGTH)
+  const tag = ciphertext.slice(ciphertext.length - GCM_TAG_LENGTH)
+  decipher.setAAD(additionalData)
+  decipher.setAuthTag(tag)
+  return Buffer.concat([decipher.update(enc), decipher.final()])
+}
+
+function aesEncryptCTR(plaintext, key, iv) {
+  const cipher = crypto_1.createCipheriv('aes-256-ctr', key, iv)
+  return Buffer.concat([cipher.update(plaintext), cipher.final()])
+}
+
+function aesDecryptCTR(ciphertext, key, iv) {
+  const decipher = crypto_1.createDecipheriv('aes-256-ctr', key, iv)
+  return Buffer.concat([decipher.update(ciphertext), decipher.final()])
+}
+
+function aesDecrypt(buffer, key) {
+  return aesDecryptWithIV(buffer.slice(16), key, buffer.slice(0, 16))
+}
+
+function aesDecryptWithIV(buffer, key, IV) {
+  const aes = crypto_1.createDecipheriv('aes-256-cbc', key, IV)
+  return Buffer.concat([aes.update(buffer), aes.final()])
+}
+
+function aesEncrypt(buffer, key) {
+  const IV = crypto_1.randomBytes(16)
+  const aes = crypto_1.createCipheriv('aes-256-cbc', key, IV)
+  return Buffer.concat([IV, aes.update(buffer), aes.final()])
+}
+
+function aesEncrypWithIV(buffer, key, IV) {
+  const aes = crypto_1.createCipheriv('aes-256-cbc', key, IV)
+  return Buffer.concat([aes.update(buffer), aes.final()])
+}
+
+function hmacSign(buffer, key, variant = 'sha256') {
+  return crypto_1.createHmac(variant, key).update(buffer).digest()
+}
+
+function sha256(buffer) {
+  return crypto_1.createHash('sha256').update(buffer).digest()
+}
+
+function md5(buffer) {
+  return crypto_1.createHash('md5').update(buffer).digest()
+}
+
+async function hkdf(buffer, expandedLength, info) {
+  // Normalize to a Uint8Array whose underlying buffer is a regular ArrayBuffer (not ArrayBufferLike)
+  // Cloning via new Uint8Array(...) guarantees the generic parameter is ArrayBuffer which satisfies WebCrypto types.
+  const inputKeyMaterial = new Uint8Array(buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer))
+  
+  // Set default values if not provided
+  const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0)
+  const infoBytes = info.info ? new TextEncoder().encode(info.info) : new Uint8Array(0)
+
+  // Import the input key material (cast to BufferSource to appease TS DOM typings)
+  const importedKey = await crypto_1.subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, [
+      'deriveBits'
+  ])
+  
+  const derivedBits = await crypto_1.subtle.deriveBits({
+    name: 'HKDF',
+    hash: 'SHA-256',
+    salt,
+    info: infoBytes
+  }, importedKey, expandedLength * 8)
+
+  return Buffer.from(derivedBits)
+}
+
+async function derivePairingCodeKey(pairingCode, salt) {
+  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 crypto_1.subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, [
+      'deriveBits'
+  ])
+
+  const derivedBits = await crypto_1.subtle.deriveBits({
+    name: 'PBKDF2',
+    salt: saltBuffer,
+    iterations: 2 << 16,
+    hash: 'SHA-256'
+  }, keyMaterial, 32 * 8)
+
+  return Buffer.from(derivedBits)
+}
+
+module.exports = {
+  generateSignalPubKey,
+  Curve,
+  signedKeyPair,
+  aesEncryptGCM,
+  aesDecryptGCM,
+  aesEncryptCTR,
+  aesDecryptCTR,
+  aesDecrypt,
+  aesDecryptWithIV,
+  aesEncrypt,
+  aesEncrypWithIV,
+  hmacSign,
+  sha256,
+  md5,
+  hkdf,
+  derivePairingCodeKey
+}

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

@@ -1,66 +1,53 @@
-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>;
-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";
+import { proto } from '../../WAProto'
+import { SignalRepository } from '../Types'
+import { BinaryNode } from '../WABinary'
+import { ILogger } from './logger'
+
+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 DECRYPTION_RETRY_CONFIG: {
-    maxRetries: number;
-    baseDelayMs: number;
-    sessionRecordErrors: string[];
-};
-/** NACK reason codes we send to the server (client → server) */
+    maxRetries: number
+    baseDelayMs: number
+    sessionRecordErrors: string[]
+}
+
 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";
-};
+    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
+}
+
 export declare const extractAddressingContext: (stanza: BinaryNode) => {
-    addressingMode: string;
-    senderAlt: string | undefined;
-    recipientAlt: string | undefined;
-};
+    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;
-    author: string;
-    sender: string;
-};
-export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepositoryWithLIDStore, logger: ILogger) => {
-    fullMessage: WAMessage;
-    category: string | undefined;
-    author: string;
-    decrypt(): Promise<void>;
-};
-//# sourceMappingURL=decode-wa-message.d.ts.map
+    fullMessage: proto.IWebMessageInfo
+    author: string
+    sender: string
+}
+
+export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: ILogger) => {
+    fullMessage: proto.IWebMessageInfo
+    category: string
+    author: string
+    decrypt(): Promise<void>
+}