@neelegirl/baileys 1.5.2 → 1.5.3

package/lib/Utils/crypto.d.ts

@@ -1,56 +1,56 @@
-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 | Buffer
-
-export declare const Curve: {
-    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: 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
-
-/**
- * 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
-
-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: 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>
-
+import { KeyPair } from '@neelegirl/baileys/lib/Types'
+
+/** prefix version byte to the pub keys, required for some curve crypto functions */
+export declare const generateSignalPubKey: (pubKey: Uint8Array | Buffer) => Uint8Array | Buffer
+
+export declare const Curve: {
+    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: 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
+
+/**
+ * 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
+
+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: 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,179 +1,189 @@
-"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("@neelegirl/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
-    }
-  }
-}
-
-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) {
-  const inputKeyMaterial = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer)
-  const salt = info.salt ? new Uint8Array(info.salt) : new Uint8Array(0)
-  const infoBytes = info.info ? new TextEncoder().encode(info.info) : new Uint8Array(0)
-
-  const importedKey = await crypto.subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, ['deriveBits'])
-
-  const derivedBits = await crypto.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 = salt instanceof Uint8Array ? salt : new Uint8Array(salt)
-
-  const keyMaterial = await crypto.subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, ['deriveBits'])
-
-  const derivedBits = await crypto.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
+"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("@neelegirl/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
+    }
+  }
+}
+
+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.subtle.importKey('raw', inputKeyMaterial, { name: 'HKDF' }, false, [
+      'deriveBits'
+  ])
+  
+  const derivedBits = await crypto.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.subtle.importKey('raw', pairingCodeBuffer, { name: 'PBKDF2' }, false, [
+      'deriveBits'
+  ])
+
+  const derivedBits = await crypto.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,41 +1,53 @@
-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 NACK_REASONS: {
-    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
-}
-
-/**
- * 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: 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>
+import { proto } from '@neelegirl/baileys/WAProto'
+import { SignalRepository } from '@neelegirl/baileys/lib/Types'
+import { BinaryNode } from '@neelegirl/baileys/lib/WABinary'
+import { ILogger } from '@neelegirl/baileys/lib/Utils/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[]
+}
+
+export declare const NACK_REASONS: {
+    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
+}
+
+/**
+ * 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: 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>
 }