@baileys-md/baileys 11.2.4 → 12.0.0

package/lib/Utils/process-message.js

@@ -21,8 +21,21 @@ const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
 /** Cleans a received message to further processing */
 const cleanMessage = (message, meId) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = (0, WABinary_1.jidNormalizedUser)(message.key.remoteJid);
-    message.key.participant = message.key.participant ? (0, WABinary_1.jidNormalizedUser)(message.key.participant) : undefined;
+    // normalize JIDs but catch errors to avoid throwing on invalid LIDs/JIDs
+    try {
+        message.key.remoteJid = (0, WABinary_1.jidNormalizedUser)(message.key.remoteJid);
+    }
+    catch (_e) {
+        // if normalization fails, retain original remoteJid
+    }
+    if (message.key.participant) {
+        try {
+            message.key.participant = (0, WABinary_1.jidNormalizedUser)(message.key.participant);
+        }
+        catch (_e) {
+            // ignore if can't normalize participant
+        }
+    }
     const content = (0, messages_1.normalizeMessageContent)(message.message);
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
     if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
@@ -117,6 +130,25 @@ const processMessage = async (message, { shouldProcessHistoryMsg, placeholderRes
         }
     }
     const content = (0, messages_1.normalizeMessageContent)(message.message);
+    const senderId = message.key.participant || message.key.remoteJid;
+    if ((0, WABinary_1.isLidUser)(senderId)) {
+        const jid = (0, WABinary_1.lidToJid)(senderId);
+        if (message.key.participant) {
+            message.key.participant = jid;
+        }
+        else {
+            message.key.remoteJid = jid;
+        }
+    }
+    const mJids = content && content.contextInfo && content.contextInfo.mentionedJid ? content.contextInfo.mentionedJid : [];
+    for (let i = 0; i < mJids.length; i++) {
+        if ((0, WABinary_1.isLidUser)(mJids[i])) {
+            mJids[i] = (0, WABinary_1.lidToJid)(mJids[i]);
+        }
+    }
+    if (content && content.contextInfo && content.contextInfo.participant && (0, WABinary_1.isLidUser)(content.contextInfo.participant)) {
+        content.contextInfo.participant = (0, WABinary_1.lidToJid)(content.contextInfo.participant);
+    }
     // unarchive chat if it's a real message, or someone reacted to our message
     // and we've the unarchive chats setting on
     if ((isRealMsg || ((_b = (_a = content === null || content === void 0 ? void 0 : content.reactionMessage) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.fromMe))

package/lib/Utils/signal.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextPreKeysNode = exports.getNextPreKeys = exports.extractDeviceJids = exports.parseAndInjectE2ESessions = exports.xmppPreKey = exports.xmppSignedPreKey = exports.generateOrGetPreKeys = exports.getPreKeys = exports.createSignalIdentity = void 0;
+const lodash_1 = require("lodash");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
@@ -66,22 +67,31 @@ const parseAndInjectE2ESessions = async (node, repository) => {
     for (const node of nodes) {
         (0, WABinary_1.assertNodeErrorFree)(node);
     }
-    await Promise.all(nodes.map(async (node) => {
-        const signedKey = (0, WABinary_1.getBinaryNodeChild)(node, 'skey');
-        const key = (0, WABinary_1.getBinaryNodeChild)(node, 'key');
-        const identity = (0, WABinary_1.getBinaryNodeChildBuffer)(node, 'identity');
-        const jid = node.attrs.jid;
-        const registrationId = (0, WABinary_1.getBinaryNodeChildUInt)(node, 'registration', 4);
-        await repository.injectE2ESession({
-            jid,
-            session: {
-                registrationId: registrationId,
-                identityKey: (0, crypto_1.generateSignalPubKey)(identity),
-                signedPreKey: extractKey(signedKey),
-                preKey: extractKey(key)
-            }
-        });
-    }));
+    // Most of the work in repository.injectE2ESession is CPU intensive, not IO
+    // So Promise.all doesn't really help here,
+    // but blocks even loop if we're using it inside keys.transaction, and it makes it "sync" actually
+    // This way we chunk it in smaller parts and between those parts we can yield to the event loop
+    // It's rare case when you need to E2E sessions for so many users, but it's possible
+    const chunkSize = 100;
+    const chunks = (0, lodash_1.chunk)(nodes, chunkSize);
+    for (const nodesChunk of chunks) {
+        await Promise.all(nodesChunk.map(async (node) => {
+            const signedKey = (0, WABinary_1.getBinaryNodeChild)(node, 'skey');
+            const key = (0, WABinary_1.getBinaryNodeChild)(node, 'key');
+            const identity = (0, WABinary_1.getBinaryNodeChildBuffer)(node, 'identity');
+            const jid = node.attrs.jid;
+            const registrationId = (0, WABinary_1.getBinaryNodeChildUInt)(node, 'registration', 4);
+            await repository.injectE2ESession({
+                jid,
+                session: {
+                    registrationId: registrationId,
+                    identityKey: (0, crypto_1.generateSignalPubKey)(identity),
+                    signedPreKey: extractKey(signedKey),
+                    preKey: extractKey(key)
+                }
+            });
+        }));
+    }
 };
 exports.parseAndInjectE2ESessions = parseAndInjectE2ESessions;
 const extractDeviceJids = (result, myJid, excludeZeroDevices) => {

package/lib/Utils/validate-connection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeSignedDeviceIdentity = exports.configureSuccessfulPairing = exports.generateRegistrationNode = exports.generateLoginNode = exports.generateMobileNode = void 0;
+exports.encodeSignedDeviceIdentity = exports.configureSuccessfulPairing = exports.generateRegistrationNode = exports.generateLoginNode = void 0;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const WAProto_1 = require("../../WAProto");
@@ -9,104 +9,103 @@ const WABinary_1 = require("../WABinary");
 const crypto_2 = require("./crypto");
 const generics_1 = require("./generics");
 const signal_1 = require("./signal");
+
 const getUserAgent = (config) => {
-    var _a, _b;
-    const osVersion = config.mobile ? '15.3.1' : '0.1';
-    const version = config.mobile ? [2, 24, 6] : config.version;
-    const device = config.mobile ? 'iPhone_7' : 'Desktop';
-    const manufacturer = config.mobile ? 'Apple' : '';
-    const platform = config.mobile ? WAProto_1.proto.ClientPayload.UserAgent.Platform.IOS : WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB;
-    const phoneId = config.mobile ? { phoneId: config.auth.creds.phoneId } : {};
     return {
         appVersion: {
-            primary: version[0],
-            secondary: version[1],
-            tertiary: version[2],
+            primary: config.version[0],
+            secondary: config.version[1],
+            tertiary: config.version[2],
         },
-        platform,
+        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
         releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        mcc: ((_a = config.auth.creds.registration) === null || _a === void 0 ? void 0 : _a.phoneNumberMobileCountryCode) || '000',
-        mnc: ((_b = config.auth.creds.registration) === null || _b === void 0 ? void 0 : _b.phoneNumberMobileNetworkCode) || '000',
-        osVersion: osVersion,
-        manufacturer,
-        device,
-        osBuildNumber: osVersion,
+        osVersion: '0.1',
+        device: 'Desktop',
+        osBuildNumber: '0.1',
         localeLanguageIso6391: 'en',
-        localeCountryIso31661Alpha2: config.countryCode,
-        ...phoneId
+        mnc: '000',
+        mcc: '000',
+        localeCountryIso31661Alpha2: config.countryCode || 'US'
     };
 };
+
 const PLATFORM_MAP = {
     'Mac OS': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.DARWIN,
     'Windows': WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WIN32
 };
+
 const getWebInfo = (config) => {
     let webSubPlatform = WAProto_1.proto.ClientPayload.WebInfo.WebSubPlatform.WEB_BROWSER;
-    if (config.syncFullHistory && PLATFORM_MAP[config.browser[0]]) {
+    if (config.syncFullHistory && PLATFORM_MAP[config.browser[0]] && config.browser[1] === 'Desktop') {
         webSubPlatform = PLATFORM_MAP[config.browser[0]];
     }
     return { webSubPlatform };
 };
+
 const getClientPayload = (config) => {
     const payload = {
         connectType: WAProto_1.proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
         connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
         userAgent: getUserAgent(config),
     };
-    if (!config.mobile) {
-        payload.webInfo = getWebInfo(config);
-    }
+    payload.webInfo = getWebInfo(config);
     return payload;
 };
-const generateMobileNode = (config) => {
-    if (!config.auth.creds) {
-        throw new boom_1.Boom('No registration data found', { data: config });
-    }
-    const payload = {
-        ...getClientPayload(config),
-        sessionId: Math.floor(Math.random() * 999999999 + 1),
-        shortConnect: true,
-        connectAttemptCount: 0,
-        device: 0,
-        dnsSource: {
-            appCached: false,
-            dnsMethod: WAProto_1.proto.ClientPayload.DNSSource.DNSResolutionMethod.SYSTEM,
-        },
-        passive: false, // XMPP heartbeat setting (false: server actively pings) (true: client actively pings)
-        pushName: 'test',
-        username: Number(`${config.auth.creds.registration.phoneNumberCountryCode}${config.auth.creds.registration.phoneNumberNationalNumber}`),
-    };
-    return WAProto_1.proto.ClientPayload.fromObject(payload);
-};
-exports.generateMobileNode = generateMobileNode;
+
 const generateLoginNode = (userJid, config) => {
     const { user, device } = (0, WABinary_1.jidDecode)(userJid);
     const payload = {
         ...getClientPayload(config),
-        passive: false,
+        passive: true,
         pull: true,
         username: +user,
         device: device,
+        lidDbMigrated: false
     };
     return WAProto_1.proto.ClientPayload.fromObject(payload);
 };
 exports.generateLoginNode = generateLoginNode;
+
 const getPlatformType = (platform) => {
     const platformType = platform.toUpperCase();
-    return WAProto_1.proto.DeviceProps.PlatformType[platformType] || WAProto_1.proto.DeviceProps.PlatformType.DESKTOP;
+    return WAProto_1.proto.DeviceProps.PlatformType[platformType] || WAProto_1.proto.DeviceProps.PlatformType.CHROME;
 };
+
 const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
-    // the app version needs to be md5 hashed
-    // and passed in
     const appVersionBuf = (0, crypto_1.createHash)('md5')
-        .update(config.version.join('.')) // join as string
+        .update(config.version.join('.'))
         .digest();
+
     const companion = {
         os: config.browser[0],
         platformType: getPlatformType(config.browser[1]),
         requireFullSync: config.syncFullHistory,
+        historySyncConfig: {
+            storageQuotaMb: 10240,
+            inlineInitialPayloadInE2EeMsg: true,
+            recentSyncDaysLimit: undefined,
+            supportCallLogHistory: false,
+            supportBotUserAgentChatHistory: true,
+            supportCagReactionsAndPolls: true,
+            supportBizHostedMsg: true,
+            supportRecentSyncChunkMessageCountTuning: true,
+            supportHostedGroupMsg: true,
+            supportFbidBotChatHistory: true,
+            supportAddOnHistorySyncMigration: undefined,
+            supportMessageAssociation: true,
+            supportGroupHistory: false,
+            onDemandReady: undefined,
+            supportGuestChat: undefined
+        },
+        version: {
+            primary: 10,
+            secondary: 15,
+            tertiary: 7
+        }
     };
+
     const companionProto = WAProto_1.proto.DeviceProps.encode(companion).finish();
+
     const registerPayload = {
         ...getClientPayload(config),
         passive: false,
@@ -125,6 +124,7 @@ const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentity
     return WAProto_1.proto.ClientPayload.fromObject(registerPayload);
 };
 exports.generateRegistrationNode = generateRegistrationNode;
+
 const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, signalIdentities }) => {
     const msgId = stanza.attrs.id;
     const pairSuccessNode = (0, WABinary_1.getBinaryNodeChild)(stanza, 'pair-success');
@@ -132,30 +132,52 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
     const platformNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'platform');
     const deviceNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'device');
     const businessNode = (0, WABinary_1.getBinaryNodeChild)(pairSuccessNode, 'biz');
+
     if (!deviceIdentityNode || !deviceNode) {
         throw new boom_1.Boom('Missing device-identity or device in pair success node', { data: stanza });
     }
-    const bizName = businessNode === null || businessNode === void 0 ? void 0 : businessNode.attrs.name;
+
+    const bizName = businessNode?.attrs.name;
     const jid = deviceNode.attrs.jid;
-    const { details, hmac } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
-    // check HMAC matches
-    const advSign = (0, crypto_2.hmacSign)(details, Buffer.from(advSecretKey, 'base64'));
+    const lid = deviceNode.attrs.lid;
+
+    const { details, hmac, accountType } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
+
+    let hmacPrefix = Buffer.from([]);
+    if (accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED) {
+        hmacPrefix = Buffer.from([0x06, 0x05]);
+    }
+
+    const advSign = (0, crypto_2.hmacSign)(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'));
     if (Buffer.compare(hmac, advSign) !== 0) {
         throw new boom_1.Boom('Invalid account signature');
     }
+
     const account = WAProto_1.proto.ADVSignedDeviceIdentity.decode(details);
     const { accountSignatureKey, accountSignature, details: deviceDetails } = account;
-    // verify the device signature matches
-    const accountMsg = Buffer.concat([Buffer.from([6, 0]), deviceDetails, signedIdentityKey.public]);
+
+    const deviceIdentity = WAProto_1.proto.ADVDeviceIdentity.decode(deviceDetails);
+
+    const accountSignaturePrefix = deviceIdentity.deviceType === WAProto_1.proto.ADVEncryptionType.HOSTED 
+        ? Buffer.from([0x06, 0x05])
+        : Buffer.from([0x06, 0x00]);
+    const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public]);
+    
     if (!crypto_2.Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
         throw new boom_1.Boom('Failed to verify account signature');
     }
-    // sign the details with our identity key
-    const deviceMsg = Buffer.concat([Buffer.from([6, 1]), deviceDetails, signedIdentityKey.public, accountSignatureKey]);
+
+    const deviceMsg = Buffer.concat([
+        Buffer.from([0x06, 0x01]),
+        deviceDetails,
+        signedIdentityKey.public,
+        accountSignatureKey
+    ]);
     account.deviceSignature = crypto_2.Curve.sign(signedIdentityKey.private, deviceMsg);
+
     const identity = (0, signal_1.createSignalIdentity)(jid, accountSignatureKey);
     const accountEnc = (0, exports.encodeSignedDeviceIdentity)(account, false);
-    const deviceIdentity = WAProto_1.proto.ADVDeviceIdentity.decode(account.details);
+
     const reply = {
         tag: 'iq',
         attrs: {
@@ -177,31 +199,31 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
             }
         ]
     };
+
     const authUpdate = {
         account,
-        me: { id: jid, name: bizName },
+        me: { id: jid, name: bizName, lid },
         signalIdentities: [
             ...(signalIdentities || []),
             identity
         ],
-        platform: platformNode === null || platformNode === void 0 ? void 0 : platformNode.attrs.name
+        platform: platformNode?.attrs.name
     };
+
     return {
         creds: authUpdate,
         reply
     };
 };
 exports.configureSuccessfulPairing = configureSuccessfulPairing;
+
 const encodeSignedDeviceIdentity = (account, includeSignatureKey) => {
-    var _a;
     account = { ...account };
-    // set to null if we are not to include the signature key
-    // or if we are including the signature key but it is empty
-    if (!includeSignatureKey || !((_a = account.accountSignatureKey) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (!includeSignatureKey || !account.accountSignatureKey?.length) {
         account.accountSignatureKey = null;
     }
     return WAProto_1.proto.ADVSignedDeviceIdentity
         .encode(account)
         .finish();
 };
-exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;
+exports.encodeSignedDeviceIdentity = encodeSignedDeviceIdentity;

package/lib/Utils/{baileys-event-stream.js → wileys-event-stream.js}

@@ -11,7 +11,7 @@ const readline_1 = require("readline");
 const generics_1 = require("./generics");
 const make_mutex_1 = require("./make-mutex");
 /**
- * Captures events from a baileys event emitter & stores them in a file
+ * Captures events from a wileys event emitter & stores them in a file
  * @param ev The event emitter to read events from
  * @param filename File to save to
  */