@badzz88/baileys 8.4.0 → 8.4.1

package/lib/Utils/companion-reg-client-utils.js

@@ -0,0 +1,35 @@
+export var CompanionWebClientType;
+(function (CompanionWebClientType) {
+    CompanionWebClientType[CompanionWebClientType["UNKNOWN"] = 0] = "UNKNOWN";
+    CompanionWebClientType[CompanionWebClientType["CHROME"] = 1] = "CHROME";
+    CompanionWebClientType[CompanionWebClientType["EDGE"] = 2] = "EDGE";
+    CompanionWebClientType[CompanionWebClientType["FIREFOX"] = 3] = "FIREFOX";
+    CompanionWebClientType[CompanionWebClientType["IE"] = 4] = "IE";
+    CompanionWebClientType[CompanionWebClientType["OPERA"] = 5] = "OPERA";
+    CompanionWebClientType[CompanionWebClientType["SAFARI"] = 6] = "SAFARI";
+    CompanionWebClientType[CompanionWebClientType["ELECTRON"] = 7] = "ELECTRON";
+    CompanionWebClientType[CompanionWebClientType["UWP"] = 8] = "UWP";
+    CompanionWebClientType[CompanionWebClientType["OTHER_WEB_CLIENT"] = 9] = "OTHER_WEB_CLIENT";
+})(CompanionWebClientType || (CompanionWebClientType = {}));
+const BROWSER_TO_COMPANION_WEB_CLIENT = {
+    Chrome: CompanionWebClientType.CHROME,
+    Edge: CompanionWebClientType.EDGE,
+    Firefox: CompanionWebClientType.FIREFOX,
+    IE: CompanionWebClientType.IE,
+    Opera: CompanionWebClientType.OPERA,
+    Safari: CompanionWebClientType.SAFARI
+};
+export const getCompanionWebClientType = ([os, browserName]) => {
+    if (browserName === 'Desktop') {
+        return os === 'Windows' ? CompanionWebClientType.UWP : CompanionWebClientType.ELECTRON;
+    }
+    return BROWSER_TO_COMPANION_WEB_CLIENT[browserName] || CompanionWebClientType.OTHER_WEB_CLIENT;
+};
+export const getCompanionPlatformId = (browser) => {
+    return getCompanionWebClientType(browser).toString();
+};
+export const buildPairingQRData = (ref, noiseKeyB64, identityKeyB64, advB64, browser) => {
+    return ('https://wa.me/settings/linked_devices#' +
+        [ref, noiseKeyB64, identityKeyB64, advB64, getCompanionPlatformId(browser)].join(','));
+};
+//# sourceMappingURL=companion-reg-client-utils.js.map

package/lib/Utils/crypto.js

@@ -1,44 +1,14 @@
-"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 Defaults_1 = require("../Defaults");
+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 */
-const generateSignalPubKey = (pubKey) => (pubKey.length === 33
-    ? pubKey
-    : Buffer.concat([Defaults_1.KEY_BUNDLE_TYPE, pubKey]));
-exports.generateSignalPubKey = generateSignalPubKey;
-exports.Curve = {
+export const generateSignalPubKey = (pubKey) => pubKey.length === 33 ? pubKey : Buffer.concat([KEY_BUNDLE_TYPE, pubKey]);
+export const Curve = {
     generateKeyPair: () => {
-        const { pubKey, privKey } = libsignal.curve.generateKeyPair();
+        const { pubKey, privKey } = curve.generateKeyPair();
         return {
             private: Buffer.from(privKey),
             // remove version byte
@@ -46,13 +16,13 @@ exports.Curve = {
         };
     },
     sharedKey: (privateKey, publicKey) => {
-        const shared = libsignal.curve.calculateAgreement((0, exports.generateSignalPubKey)(publicKey), privateKey);
+        const shared = curve.calculateAgreement(generateSignalPubKey(publicKey), privateKey);
         return Buffer.from(shared);
     },
-    sign: (privateKey, buf) => (libsignal.curve.calculateSignature(privateKey, buf)),
+    sign: (privateKey, buf) => curve.calculateSignature(privateKey, buf),
     verify: (pubKey, message, signature) => {
         try {
-            libsignal.curve.verifySignature((0, exports.generateSignalPubKey)(pubKey), message, signature);
+            curve.verifySignature(generateSignalPubKey(pubKey), message, signature);
             return true;
         }
         catch (error) {
@@ -60,30 +30,28 @@ exports.Curve = {
         }
     }
 };
-const signedKeyPair = (identityKeyPair, keyId) => {
-    const preKey = exports.Curve.generateKeyPair();
-    const pubKey = (0, exports.generateSignalPubKey)(preKey.public);
-    const signature = exports.Curve.sign(identityKeyPair.private, pubKey);
+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 };
 };
-exports.signedKeyPair = signedKeyPair;
 const GCM_TAG_LENGTH = 128 >> 3;
 /**
  * encrypt AES 256 GCM;
  * where the tag tag is suffixed to the ciphertext
  * */
-function aesEncryptGCM(plaintext, key, iv, additionalData) {
-    const cipher = (0, crypto_1.createCipheriv)('aes-256-gcm', key, iv);
+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()]);
 }
-exports.aesEncryptGCM = aesEncryptGCM;
 /**
  * decrypt AES 256 GCM;
  * where the auth tag is suffixed to the ciphertext
  * */
-function aesDecryptGCM(ciphertext, key, iv, additionalData) {
-    const decipher = (0, crypto_1.createDecipheriv)('aes-256-gcm', key, iv);
+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);
@@ -92,60 +60,59 @@ function aesDecryptGCM(ciphertext, key, iv, additionalData) {
     decipher.setAuthTag(tag);
     return Buffer.concat([decipher.update(enc), decipher.final()]);
 }
-exports.aesDecryptGCM = aesDecryptGCM;
-function aesEncryptCTR(plaintext, key, iv) {
-    const cipher = (0, crypto_1.createCipheriv)('aes-256-ctr', key, iv);
+export function aesEncryptCTR(plaintext, key, iv) {
+    const cipher = createCipheriv('aes-256-ctr', key, iv);
     return Buffer.concat([cipher.update(plaintext), cipher.final()]);
 }
-exports.aesEncryptCTR = aesEncryptCTR;
-function aesDecryptCTR(ciphertext, key, iv) {
-    const decipher = (0, crypto_1.createDecipheriv)('aes-256-ctr', key, iv);
+export function aesDecryptCTR(ciphertext, key, iv) {
+    const decipher = 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 */
-function aesDecrypt(buffer, key) {
-    return aesDecryptWithIV(buffer.slice(16, buffer.length), key, buffer.slice(0, 16));
+export function aesDecrypt(buffer, key) {
+    return aesDecryptWithIV(buffer.subarray(16), key, buffer.subarray(0, 16));
 }
-exports.aesDecrypt = aesDecrypt;
 /** decrypt AES 256 CBC */
-function aesDecryptWithIV(buffer, key, IV) {
-    const aes = (0, crypto_1.createDecipheriv)('aes-256-cbc', key, IV);
+export function aesDecryptWithIV(buffer, key, IV) {
+    const aes = 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
-function aesEncrypt(buffer, key) {
-    const IV = (0, crypto_1.randomBytes)(16);
-    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, IV);
+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
 }
-exports.aesEncrypt = aesEncrypt;
 // encrypt AES 256 CBC with a given IV
-function aesEncrypWithIV(buffer, key, IV) {
-    const aes = (0, crypto_1.createCipheriv)('aes-256-cbc', key, 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
 }
-exports.aesEncrypWithIV = aesEncrypWithIV;
 // sign HMAC using SHA 256
-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 hmacSign(buffer, key, variant = 'sha256') {
+    return createHmac(variant, key).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 function sha256(buffer) {
+    return createHash('sha256').update(buffer).digest();
 }
-exports.hkdf = hkdf;
-function derivePairingCodeKey(pairingCode, salt) {
-    return (0, crypto_1.pbkdf2Sync)(pairingCode, salt, 2 << 16, 32, 'sha256');
+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.derivePairingCodeKey = derivePairingCodeKey;
+//# sourceMappingURL=crypto.js.map