@queenanya/baileys 8.2.7-beta → 8.3.1

package/lib/Utils/messages-media.js

@@ -36,15 +36,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.changeprofileFull = exports.generatePP = exports.generateProfilePictureFP = exports.generateProfilePictureFull = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.hkdfInfoKey = void 0;
+exports.getStatusCodeForMediaRetry = exports.decryptMediaRetryData = exports.decodeMediaRetryNode = exports.encryptMediaRetryRequest = exports.getWAUploadToServer = exports.downloadEncryptedContent = exports.downloadContentFromMessage = exports.getUrlFromDirectPath = exports.encryptedStream = exports.prepareStream = exports.getHttpStream = exports.getStream = exports.toBuffer = exports.toReadable = exports.mediaMessageSHA256B64 = exports.generateProfilePicture = exports.encodeBase64EncodedStringForUpload = exports.extractImageThumb = exports.extractVideoThumb = exports.hkdfInfoKey = void 0;
 exports.getMediaKeys = getMediaKeys;
+exports.uploadFile = uploadFile;
+exports.vid2jpg = vid2jpg;
 exports.getAudioDuration = getAudioDuration;
 exports.getAudioWaveform = getAudioWaveform;
 exports.generateThumbnail = generateThumbnail;
 exports.extensionForMediaMessage = extensionForMediaMessage;
 const boom_1 = require("@hapi/boom");
 const axios_1 = __importDefault(require("axios"));
-const child_process_1 = require("child_process");
+const form_data_1 = __importDefault(require("form-data"));
+const cheerio = __importStar(require("cheerio"));
 const Crypto = __importStar(require("crypto"));
 const events_1 = require("events");
 const fs_1 = require("fs");
@@ -99,18 +102,163 @@ async function getMediaKeys(buffer, mediaType) {
         macKey: expandedMediaKey.slice(48, 80),
     };
 }
-/** Extracts video thumb using FFMPEG */
-const extractVideoThumb = async (path, destPath, time, size) => new Promise((resolve, reject) => {
-    const cmd = `ffmpeg -ss ${time} -i ${path} -y -vf scale=${size.width}:-1 -vframes 1 -f image2 ${destPath}`;
-    (0, child_process_1.exec)(cmd, (err) => {
-        if (err) {
-            reject(err);
+async function uploadFile(buffer, logger) {
+    const { fromBuffer } = await Promise.resolve().then(() => __importStar(require('file-type')));
+    const fileType = await fromBuffer(buffer);
+    if (!fileType)
+        throw new Error("Failed to detect file type.");
+    const { ext, mime } = fileType;
+    const services = [
+        {
+            name: "catbox",
+            url: "https://catbox.moe/user/api.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("fileToUpload", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                form.append("reqtype", "fileupload");
+                return form;
+            },
+            parseResponse: res => res.data
+        },
+        {
+            name: "pdi.moe",
+            url: "https://scdn.pdi.moe/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => res.data.result.url
+        },
+        {
+            name: "qu.ax",
+            url: "https://qu.ax/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from qu.ax");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "uguu.se",
+            url: "https://uguu.se/upload.php",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("files[]", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime || "application/octet-stream"
+                });
+                return form;
+            },
+            parseResponse: res => {
+                var _a, _b, _c;
+                if (!((_c = (_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.url))
+                    throw new Error("Failed to get URL from uguu.se");
+                return res.data.files[0].url;
+            }
+        },
+        {
+            name: "tmpfiles",
+            url: "https://tmpfiles.org/api/v1/upload",
+            buildForm: () => {
+                const form = new form_data_1.default();
+                form.append("file", buffer, {
+                    filename: `file.${ext}`,
+                    contentType: mime
+                });
+                return form;
+            },
+            parseResponse: res => {
+                const match = res.data.data.url.match(/https:\/\/tmpfiles\.org\/(.*)/);
+                if (!match)
+                    throw new Error("Failed to parse tmpfiles URL.");
+                return `https://tmpfiles.org/dl/${match[1]}`;
+            }
         }
-        else {
-            resolve();
+    ];
+    for (const service of services) {
+        try {
+            const form = service.buildForm();
+            const res = await axios_1.default.post(service.url, form, {
+                headers: form.getHeaders()
+            });
+            const url = service.parseResponse(res);
+            return url;
+        }
+        catch (error) {
+            logger === null || logger === void 0 ? void 0 : logger.debug(`[${service.name}] eror:`, (error === null || error === void 0 ? void 0 : error.message) || error);
+        }
+    }
+    throw new Error("All upload services failed.");
+}
+async function vid2jpg(videoUrl) {
+    try {
+        const { data } = await axios_1.default.get(`https://ezgif.com/video-to-jpg?url=${encodeURIComponent(videoUrl)}`);
+        const $ = cheerio.load(data);
+        const fileToken = $('input[name="file"]').attr("value");
+        if (!fileToken) {
+            throw new Error("Failed to retrieve file token. The video URL may be invalid or inaccessible.");
+        }
+        const formData = new URLSearchParams();
+        formData.append("file", fileToken);
+        formData.append("end", "1");
+        formData.append("video-to-jpg", "Convert to JPG!");
+        const convert = await axios_1.default.post(`https://ezgif.com/video-to-jpg/${fileToken}`, formData);
+        const $2 = cheerio.load(convert.data);
+        let imageUrl = $2("#output img").first().attr("src");
+        if (!imageUrl) {
+            throw new Error("Could not locate the converted image output.");
+        }
+        if (imageUrl.startsWith("//")) {
+            imageUrl = "https:" + imageUrl;
+        }
+        else if (imageUrl.startsWith("/")) {
+            const cdnMatch = imageUrl.match(/\/(s\d+\..+?)\/.*/);
+            if (cdnMatch) {
+                imageUrl = "https://" + imageUrl.slice(2);
+            }
+            else {
+                imageUrl = "https://ezgif.com" + imageUrl;
+            }
         }
+        return imageUrl;
+    }
+    catch (error) {
+        throw new Error("Failed to convert video to JPG: " + error.message);
+    }
+}
+/**
+ * Originally written by Techwiz (https://github.com/techwiz37)
+ * Modified for customization and improvements
+ */
+const extractVideoThumb = async (videoPath) => {
+    const videoBuffer = await fs_1.promises.readFile(videoPath);
+    const dataUrl = await uploadFile(videoBuffer);
+    if (!dataUrl || typeof dataUrl !== 'string') {
+        throw new Error('Failed to upload video: Invalid or missing URL');
+    }
+    const jpgUrl = await vid2jpg(dataUrl);
+    const { data: imageBuffer } = await axios_1.default.get(jpgUrl, {
+        responseType: 'arraybuffer',
     });
-});
+    return imageBuffer;
+};
+exports.extractVideoThumb = extractVideoThumb;
 const extractImageThumb = async (bufferOrFilePath, width = 32) => {
     var _a, _b;
     if (bufferOrFilePath instanceof stream_1.Readable) {
@@ -180,76 +328,6 @@ const generateProfilePicture = async (mediaUpload) => {
     };
 };
 exports.generateProfilePicture = generateProfilePicture;
-const generateProfilePictureFull = async (img) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await read(img);
-    const min = Math.min(jimp.getWidth(), jimp.getHeight());
-    const cropped = jimp.crop(0, 0, jimp.getWidth(), jimp.getHeight());
-    let width = jimp.getWidth(), hight = jimp.getHeight(), ratio;
-    if (width > hight) {
-        ratio = jimp.getWidth() / 720;
-    }
-    else {
-        ratio = jimp.getWidth() / 324;
-    }
-    ;
-    width = width / ratio;
-    hight = hight / ratio;
-    img = cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG);
-    return {
-        img: await cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG),
-    };
-};
-exports.generateProfilePictureFull = generateProfilePictureFull;
-const generateProfilePictureFP = async (buffer) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await Jimp.read(buffer);
-    const min = jimp.getWidth();
-    const max = jimp.getHeight();
-    const cropped = jimp.crop(0, 0, min, max);
-    return {
-        img: await cropped.scaleToFit(720, 720).getBufferAsync(Jimp.MIME_JPEG),
-        preview: await cropped.normalize().getBufferAsync(Jimp.MIME_JPEG),
-    };
-};
-exports.generateProfilePictureFP = generateProfilePictureFP;
-const generatePP = async (buffer) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await Jimp.read(buffer);
-    const min = jimp.getWidth();
-    const max = jimp.getHeight();
-    const cropped = jimp.crop(0, 0, min, max);
-    return {
-        img: await cropped.scaleToFit(720, 720).getBufferAsync(Jimp.MIME_JPEG),
-        preview: await cropped.normalize().getBufferAsync(Jimp.MIME_JPEG),
-    };
-};
-exports.generatePP = generatePP;
-const changeprofileFull = async (img) => {
-    const Jimp = require('jimp');
-    const { read, MIME_JPEG, RESIZE_BILINEAR } = require('jimp');
-    const jimp = await read(img);
-    const min = Math.min(jimp.getWidth(), jimp.getHeight());
-    const cropped = jimp.crop(0, 0, jimp.getWidth(), jimp.getHeight());
-    let width = jimp.getWidth(), hight = jimp.getHeight(), ratio;
-    if (width > hight) {
-        ratio = jimp.getWidth() / 720;
-    }
-    else {
-        ratio = jimp.getWidth() / 324;
-    }
-    ;
-    width = width / ratio;
-    hight = hight / ratio;
-    img = cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG);
-    return {
-        img: await cropped.quality(100).resize(width, hight).getBufferAsync(MIME_JPEG),
-    };
-};
-exports.changeprofileFull = changeprofileFull;
 /** gets the SHA256 of the given media message */
 const mediaMessageSHA256B64 = (message) => {
     const media = Object.values(message)[0];
@@ -362,11 +440,18 @@ async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
         try {
-            await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
-            const buff = await fs_1.promises.readFile(imgFilename);
-            thumbnail = buff.toString('base64');
+            const thumbnailBuffer = await (0, exports.extractVideoThumb)(file);
+            const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
+            await fs_1.promises.writeFile(imgFilename, thumbnailBuffer);
+            const { buffer: processedThumbnailBuffer, original } = await (0, exports.extractImageThumb)(imgFilename);
+            thumbnail = processedThumbnailBuffer.toString('base64');
+            if (original.width && original.height) {
+                originalImageDimensions = {
+                    width: original.width,
+                    height: original.height,
+                };
+            }
             await fs_1.promises.unlink(imgFilename);
         }
         catch (err) {
@@ -437,7 +522,7 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
     let writeStream;
     let didSaveToTmpPath = false;
     if (type === 'file') {
-        bodyPath = media.url.toString();
+        bodyPath = media.url;
     }
     else if (saveOriginalFileIfRequired) {
         bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)());
@@ -460,8 +545,10 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                 });
             }
             sha256Plain = sha256Plain.update(data);
-            if (writeStream && !writeStream.write(data)) {
-                await (0, events_1.once)(writeStream, 'drain');
+            if (writeStream) {
+                if (!writeStream.write(data)) {
+                    await (0, events_1.once)(writeStream, 'drain');
+                }
             }
             onChunk(aes.update(data));
         }

package/lib/Utils/messages.d.ts

@@ -38,7 +38,7 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
 /**
  * Returns the device predicted by message ID
  */
-export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
+export declare const getDevice: (id: string) => "web" | "unknown" | "android" | "ios" | "desktop";
 /** Upserts a receipt in the message */
 export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, "userReceipt">, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */

package/lib/Utils/messages.js

@@ -275,9 +275,6 @@ const generateWAMessageContent = async (message, options) => {
             extContent.font = options.font;
         }
         m.extendedTextMessage = extContent;
-        m.messageContextInfo = {
-            messageSecret: (0, crypto_1.randomBytes)(32)
-        };
     }
     else if ('contacts' in message) {
         const contactLen = message.contacts.contacts.length;
@@ -566,7 +563,7 @@ const generateWAMessageContent = async (message, options) => {
             title: message.title,
             footerText: message.footer,
             description: message.text,
-            listType: message.hasOwnProperty('listType') ? message.listType : WAProto_1.proto.Message.ListMessage.ListType.PRODUCT_LIST
+            listType: WAProto_1.proto.Message.ListMessage.ListType.SINGLE_SELECT
         };
         m = { listMessage };
     }
@@ -804,7 +801,9 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.groupStatusMessage)
             || (message === null || message === void 0 ? void 0 : message.limitSharingMessage)
             || (message === null || message === void 0 ? void 0 : message.botTaskMessage)
-            || (message === null || message === void 0 ? void 0 : message.questionMessage));
+            || (message === null || message === void 0 ? void 0 : message.questionMessage)
+            || (message === null || message === void 0 ? void 0 : message.groupStatusMessageV2)
+            || (message === null || message === void 0 ? void 0 : message.botForwardedMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -877,9 +876,8 @@ const updateMessageWithReaction = (msg, reaction) => {
     const authorID = (0, generics_1.getKeyAuthor)(reaction.key);
     const reactions = (msg.reactions || [])
         .filter(r => (0, generics_1.getKeyAuthor)(r.key) !== authorID);
-    if (reaction.text) {
-        reactions.push(reaction);
-    }
+    reaction.text = reaction.text || '';
+    reactions.push(reaction);
     msg.reactions = reactions;
 };
 exports.updateMessageWithReaction = updateMessageWithReaction;
@@ -959,13 +957,17 @@ const downloadMediaMessage = async (message, type, options, ctx) => {
     const result = await downloadMsg()
         .catch(async (error) => {
         var _a;
-        if (ctx && axios_1.default.isAxiosError(error) && // check if the message requires a reupload
-            REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
-            ctx.logger.info({ key: message.key }, 'sending reupload media request...');
-            // request reupload
-            message = await ctx.reuploadRequest(message);
-            const result = await downloadMsg();
-            return result;
+        if (ctx) {
+            if (axios_1.default.isAxiosError(error)) {
+                // check if the message requires a reupload
+                if (REUPLOAD_REQUIRED_STATUS.includes((_a = error.response) === null || _a === void 0 ? void 0 : _a.status)) {
+                    ctx.logger.info({ key: message.key }, 'sending reupload media request...');
+                    // request reupload
+                    message = await ctx.reuploadRequest(message);
+                    const result = await downloadMsg();
+                    return result;
+                }
+            }
         }
         throw error;
     });

package/lib/Utils/noise-handler.d.ts

@@ -2,9 +2,10 @@ import { ILogger } from './logger';
 import { proto } from '../../WAProto';
 import { KeyPair } from '../Types';
 import { BinaryNode } from '../WABinary';
-export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }: {
+export declare const makeNoiseHandler: ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }: {
     keyPair: KeyPair;
     NOISE_HEADER: Uint8Array;
+    mobile: boolean;
     logger: ILogger;
     routingInfo?: Buffer | undefined;
 }) => {

package/lib/Utils/noise-handler.js

@@ -11,7 +11,7 @@ const generateIV = (counter) => {
     new DataView(iv).setUint32(8, counter);
     return new Uint8Array(iv);
 };
-const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
+const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, mobile, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
     const authenticate = (data) => {
         if (!isFinished) {
@@ -83,10 +83,15 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             const decStaticContent = decrypt(serverHello.static);
             await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent));
             const certDecoded = decrypt(serverHello.payload);
-            const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
-            const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
-            if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                throw new boom_1.Boom('certification match failed', { statusCode: 400 });
+            if (mobile) {
+                WAProto_1.proto.CertChain.NoiseCertificate.decode(certDecoded);
+            }
+            else {
+                const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
+                const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
+                if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
+                    throw new boom_1.Boom('certification match failed', { statusCode: 400 });
+                }
             }
             const keyEnc = encrypt(noiseKey.public);
             await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));

package/lib/Utils/validate-connection.d.ts

@@ -1,6 +1,7 @@
 import { proto } from '../../WAProto';
 import type { AuthenticationCreds, SignalCreds, SocketConfig } from '../Types';
 import { BinaryNode } from '../WABinary';
+export declare const generateMobileNode: (config: SocketConfig) => proto.IClientPayload;
 export declare const generateLoginNode: (userJid: string, config: SocketConfig) => proto.IClientPayload;
 export declare const generateRegistrationNode: ({ registrationId, signedPreKey, signedIdentityKey }: SignalCreds, config: SocketConfig) => proto.ClientPayload;
 export declare const configureSuccessfulPairing: (stanza: BinaryNode, { advSecretKey, signedIdentityKey, signalIdentities }: Pick<AuthenticationCreds, "advSecretKey" | "signedIdentityKey" | "signalIdentities">) => {

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 = void 0;
+exports.encodeSignedDeviceIdentity = exports.configureSuccessfulPairing = exports.generateRegistrationNode = exports.generateLoginNode = exports.generateMobileNode = void 0;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const WAProto_1 = require("../../WAProto");
@@ -10,19 +10,30 @@ 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: config.version[0],
-            secondary: config.version[1],
-            tertiary: config.version[2],
+            primary: version[0],
+            secondary: version[1],
+            tertiary: version[2],
         },
-        platform: WAProto_1.proto.ClientPayload.UserAgent.Platform.WEB,
+        platform,
         releaseChannel: WAProto_1.proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
-        osVersion: '0.1',
-        device: 'Desktop',
-        osBuildNumber: '0.1',
+        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,
         localeLanguageIso6391: 'en',
-        localeCountryIso31661Alpha2: config.countryCode
+        localeCountryIso31661Alpha2: config.countryCode,
+        ...phoneId
     };
 };
 const PLATFORM_MAP = {
@@ -42,9 +53,32 @@ const getClientPayload = (config) => {
         connectReason: WAProto_1.proto.ClientPayload.ConnectReason.USER_ACTIVATED,
         userAgent: getUserAgent(config),
     };
-    payload.webInfo = getWebInfo(config);
+    if (!config.mobile) {
+        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 = {
@@ -103,21 +137,21 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
     }
     const bizName = businessNode === null || businessNode === void 0 ? void 0 : 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 { details, hmac, accountType } = WAProto_1.proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content);
+    const isHostedAccount = accountType !== undefined && accountType === WAProto_1.proto.ADVEncryptionType.HOSTED;
+    const hmacPrefix = isHostedAccount ? Buffer.from([6, 5]) : Buffer.alloc(0);
+    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]);
     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 devicePrefix = isHostedAccount ? Buffer.from([6, 6]) : Buffer.from([6, 1]);
+    const deviceMsg = Buffer.concat([devicePrefix, 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);

package/lib/WABinary/constants.d.ts

@@ -4,6 +4,8 @@ export declare const TAGS: {
     DICTIONARY_1: number;
     DICTIONARY_2: number;
     DICTIONARY_3: number;
+    INTEROP_JID: number;
+    FB_JID: number;
     AD_JID: number;
     LIST_8: number;
     LIST_16: number;
@@ -14,11 +16,9 @@ export declare const TAGS: {
     BINARY_32: number;
     NIBBLE_8: number;
     PACKED_MAX: number;
-    SINGLE_BYTE_MAX: number;
-    STREAM_END: number;
 };
-export declare const DOUBLE_BYTE_TOKENS: string[][];
-export declare const SINGLE_BYTE_TOKENS: (string | null)[];
+export declare const DOUBLE_BYTE_TOKENS: readonly [readonly ["read-self", "active", "fbns", "protocol", "reaction", "screen_width", "heartbeat", "deviceid", "2:47DEQpj8", "uploadfieldstat", "voip_settings", "retry", "priority", "longitude", "conflict", "false", "ig_professional", "replaced", "preaccept", "cover_photo", "uncompressed", "encopt", "ppic", "04", "passive", "status-revoke-drop", "keygen", "540", "offer", "rate", "opus", "latitude", "w:gp2", "ver", "4", "business_profile", "medium", "sender", "prev_v_id", "email", "website", "invited", "sign_credential", "05", "transport", "skey", "reason", "peer_abtest_bucket", "America/Sao_Paulo", "appid", "refresh", "100", "06", "404", "101", "104", "107", "102", "109", "103", "member_add_mode", "105", "transaction-id", "110", "106", "outgoing", "108", "111", "tokens", "followers", "ig_handle", "self_pid", "tue", "dec", "thu", "joinable", "peer_pid", "mon", "features", "wed", "peer_device_presence", "pn", "delete", "07", "fri", "audio_duration", "admin", "connected", "delta", "rcat", "disable", "collection", "08", "480", "sat", "phash", "all", "invite", "accept", "critical_unblock_low", "group_update", "signed_credential", "blinded_credential", "eph_setting", "net", "09", "background_location", "refresh_id", "Asia/Kolkata", "privacy_mode_ts", "account_sync", "voip_payload_type", "service_areas", "acs_public_key", "v_id", "0a", "fallback_class", "relay", "actual_actors", "metadata", "w:biz", "5", "connected-limit", "notice", "0b", "host_storage", "fb_page", "subject", "privatestats", "invis", "groupadd", "010", "note.m4r", "uuid", "0c", "8000", "sun", "372", "1020", "stage", "1200", "720", "canonical", "fb", "011", "video_duration", "0d", "1140", "superadmin", "012", "Opening.m4r", "keystore_attestation", "dleq_proof", "013", "timestamp", "ab_key", "w:sync:app:state", "0e", "vertical", "600", "p_v_id", "6", "likes", "014", "500", "1260", "creator", "0f", "rte", "destination", "group", "group_info", "syncd_anti_tampering_fatal_exception_enabled", "015", "dl_bw", "Asia/Jakarta", "vp8/h.264", "online", "1320", "fb:multiway", "10", "timeout", "016", "nse_retry", "urn:xmpp:whatsapp:dirty", "017", "a_v_id", "web_shops_chat_header_button_enabled", "nse_call", "inactive-upgrade", "none", "web", "groups", "2250", "mms_hot_content_timespan_in_seconds", "contact_blacklist", "nse_read", "suspended_group_deletion_notification", "binary_version", "018", "https://www.whatsapp.com/otp/copy/", "reg_push", "shops_hide_catalog_attachment_entrypoint", "server_sync", ".", "ephemeral_messages_allowed_values", "019", "mms_vcache_aggregation_enabled", "iphone", "America/Argentina/Buenos_Aires", "01a", "mms_vcard_autodownload_size_kb", "nse_ver", "shops_header_dropdown_menu_item", "dhash", "catalog_status", "communities_mvp_new_iqs_serverprop", "blocklist", "default", "11", "ephemeral_messages_enabled", "01b", "original_dimensions", "8", "mms4_media_retry_notification_encryption_enabled", "mms4_server_error_receipt_encryption_enabled", "original_image_url", "sync", "multiway", "420", "companion_enc_static", "shops_profile_drawer_entrypoint", "01c", "vcard_as_document_size_kb", "status_video_max_duration", "request_image_url", "01d", "regular_high", "s_t", "abt", "share_ext_min_preliminary_image_quality", "01e", "32", "syncd_key_rotation_enabled", "data_namespace", "md_downgrade_read_receipts2", "patch", "polltype", "ephemeral_messages_setting", "userrate", "15", "partial_pjpeg_bw_threshold", "played-self", "catalog_exists", "01f", "mute_v2"], readonly ["reject", "dirty", "announcement", "020", "13", "9", "status_video_max_bitrate", "fb:thrift_iq", "offline_batch", "022", "full", "ctwa_first_business_reply_logging", "h.264", "smax_id", "group_description_length", "https://www.whatsapp.com/otp/code", "status_image_max_edge", "smb_upsell_business_profile_enabled", "021", "web_upgrade_to_md_modal", "14", "023", "s_o", "smaller_video_thumbs_status_enabled", "media_max_autodownload", "960", "blocking_status", "peer_msg", "joinable_group_call_client_version", "group_call_video_maximization_enabled", "return_snapshot", "high", "America/Mexico_City", "entry_point_block_logging_enabled", "pop", "024", "1050", "16", "1380", "one_tap_calling_in_group_chat_size", "regular_low", "inline_joinable_education_enabled", "hq_image_max_edge", "locked", "America/Bogota", "smb_biztools_deeplink_enabled", "status_image_quality", "1088", "025", "payments_upi_intent_transaction_limit", "voip", "w:g2", "027", "md_pin_chat_enabled", "026", "multi_scan_pjpeg_download_enabled", "shops_product_grid", "transaction_id", "ctwa_context_enabled", "20", "fna", "hq_image_quality", "alt_jpeg_doc_detection_quality", "group_call_max_participants", "pkey", "America/Belem", "image_max_kbytes", "web_cart_v1_1_order_message_changes_enabled", "ctwa_context_enterprise_enabled", "urn:xmpp:whatsapp:account", "840", "Asia/Kuala_Lumpur", "max_participants", "video_remux_after_repair_enabled", "stella_addressbook_restriction_type", "660", "900", "780", "context_menu_ios13_enabled", "mute-state", "ref", "payments_request_messages", "029", "frskmsg", "vcard_max_size_kb", "sample_buffer_gif_player_enabled", "match_last_seen", "510", "4983", "video_max_bitrate", "028", "w:comms:chat", "17", "frequently_forwarded_max", "groups_privacy_blacklist", "Asia/Karachi", "02a", "web_download_document_thumb_mms_enabled", "02b", "hist_sync", "biz_block_reasons_version", "1024", "18", "web_is_direct_connection_for_plm_transparent", "view_once_write", "file_max_size", "paid_convo_id", "online_privacy_setting", "video_max_edge", "view_once_read", "enhanced_storage_management", "multi_scan_pjpeg_encoding_enabled", "ctwa_context_forward_enabled", "video_transcode_downgrade_enable", "template_doc_mime_types", "hq_image_bw_threshold", "30", "body", "u_aud_limit_sil_restarts_ctrl", "other", "participating", "w:biz:directory", "1110", "vp8", "4018", "meta", "doc_detection_image_max_edge", "image_quality", "1170", "02c", "smb_upsell_chat_banner_enabled", "key_expiry_time_second", "pid", "stella_interop_enabled", "19", "linked_device_max_count", "md_device_sync_enabled", "02d", "02e", "360", "enhanced_block_enabled", "ephemeral_icon_in_forwarding", "paid_convo_status", "gif_provider", "project_name", "server-error", "canonical_url_validation_enabled", "wallpapers_v2", "syncd_clear_chat_delete_chat_enabled", "medianotify", "02f", "shops_required_tos_version", "vote", "reset_skey_on_id_change", "030", "image_max_edge", "multicast_limit_global", "ul_bw", "21", "25", "5000", "poll", "570", "22", "031", "1280", "WhatsApp", "032", "bloks_shops_enabled", "50", "upload_host_switching_enabled", "web_ctwa_context_compose_enabled", "ptt_forwarded_features_enabled", "unblocked", "partial_pjpeg_enabled", "fbid:devices", "height", "ephemeral_group_query_ts", "group_join_permissions", "order", "033", "alt_jpeg_status_quality", "migrate", "popular-bank", "win_uwp_deprecation_killswitch_enabled", "web_download_status_thumb_mms_enabled", "blocking", "url_text", "035", "web_forwarding_limit_to_groups", "1600", "val", "1000", "syncd_msg_date_enabled", "bank-ref-id", "max_subject", "payments_web_enabled", "web_upload_document_thumb_mms_enabled", "size", "request", "ephemeral", "24", "receipt_agg", "ptt_remember_play_position", "sampling_weight", "enc_rekey", "mute_always", "037", "034", "23", "036", "action", "click_to_chat_qr_enabled", "width", "disabled", "038", "md_blocklist_v2", "played_self_enabled", "web_buttons_message_enabled", "flow_id", "clear", "450", "fbid:thread", "bloks_session_state", "America/Lima", "attachment_picker_refresh", "download_host_switching_enabled", "1792", "u_aud_limit_sil_restarts_test2", "custom_urls", "device_fanout", "optimistic_upload", "2000", "key_cipher_suite", "web_smb_upsell_in_biz_profile_enabled", "e", "039", "siri_post_status_shortcut", "pair-device", "lg", "lc", "stream_attribution_url", "model", "mspjpeg_phash_gen", "catalog_send_all", "new_multi_vcards_ui", "share_biz_vcard_enabled", "-", "clean", "200", "md_blocklist_v2_server", "03b", "03a", "web_md_migration_experience", "ptt_conversation_waveform", "u_aud_limit_sil_restarts_test1"], readonly ["64", "ptt_playback_speed_enabled", "web_product_list_message_enabled", "paid_convo_ts", "27", "manufacturer", "psp-routing", "grp_uii_cleanup", "ptt_draft_enabled", "03c", "business_initiated", "web_catalog_products_onoff", "web_upload_link_thumb_mms_enabled", "03e", "mediaretry", "35", "hfm_string_changes", "28", "America/Fortaleza", "max_keys", "md_mhfs_days", "streaming_upload_chunk_size", "5541", "040", "03d", "2675", "03f", "...", "512", "mute", "48", "041", "alt_jpeg_quality", "60", "042", "md_smb_quick_reply", "5183", "c", "1343", "40", "1230", "043", "044", "mms_cat_v1_forward_hot_override_enabled", "user_notice", "ptt_waveform_send", "047", "Asia/Calcutta", "250", "md_privacy_v2", "31", "29", "128", "md_messaging_enabled", "046", "crypto", "690", "045", "enc_iv", "75", "failure", "ptt_oot_playback", "AIzaSyDR5yfaG7OG8sMTUj8kfQEb8T9pN8BM6Lk", "w", "048", "2201", "web_large_files_ui", "Asia/Makassar", "812", "status_collapse_muted", "1334", "257", "2HP4dm", "049", "patches", "1290", "43cY6T", "America/Caracas", "web_sticker_maker", "campaign", "ptt_pausable_enabled", "33", "42", "attestation", "biz", "04b", "query_linked", "s", "125", "04a", "810", "availability", "1411", "responsiveness_v2_m1", "catalog_not_created", "34", "America/Santiago", "1465", "enc_p", "04d", "status_info", "04f", "key_version", "..", "04c", "04e", "md_group_notification", "1598", "1215", "web_cart_enabled", "37", "630", "1920", "2394", "-1", "vcard", "38", "elapsed", "36", "828", "peer", "pricing_category", "1245", "invalid", "stella_ios_enabled", "2687", "45", "1528", "39", "u_is_redial_audio_1104_ctrl", "1025", "1455", "58", "2524", "2603", "054", "bsp_system_message_enabled", "web_pip_redesign", "051", "verify_apps", "1974", "1272", "1322", "1755", "052", "70", "050", "1063", "1135", "1361", "80", "1096", "1828", "1851", "1251", "1921", "key_config_id", "1254", "1566", "1252", "2525", "critical_block", "1669", "max_available", "w:auth:backup:token", "product", "2530", "870", "1022", "participant_uuid", "web_cart_on_off", "1255", "1432", "1867", "41", "1415", "1440", "240", "1204", "1608", "1690", "1846", "1483", "1687", "1749", "69", "url_number", "053", "1325", "1040", "365", "59", "Asia/Riyadh", "1177", "test_recommended", "057", "1612", "43", "1061", "1518", "1635", "055", "1034", "1375", "750", "1430", "event_code", "1682", "503", "55", "865", "78", "1309", "1365", "44", "America/Guayaquil", "535", "LIMITED", "1377", "1613", "1420", "1599", "1822", "05a", "1681", "password", "1111", "1214", "1376", "1478", "47", "1082", "4282", "Europe/Istanbul", "1307", "46", "058", "1124", "256", "rate-overlimit", "retail", "u_a_socket_err_fix_succ_test", "1292", "1370", "1388", "520", "861", "psa", "regular", "1181", "1766", "05b", "1183", "1213", "1304", "1537"], readonly ["1724", "profile_picture", "1071", "1314", "1605", "407", "990", "1710", "746", "pricing_model", "056", "059", "061", "1119", "6027", "65", "877", "1607", "05d", "917", "seen", "1516", "49", "470", "973", "1037", "1350", "1394", "1480", "1796", "keys", "794", "1536", "1594", "2378", "1333", "1524", "1825", "116", "309", "52", "808", "827", "909", "495", "1660", "361", "957", "google", "1357", "1565", "1967", "996", "1775", "586", "736", "1052", "1670", "bank", "177", "1416", "2194", "2222", "1454", "1839", "1275", "53", "997", "1629", "6028", "smba", "1378", "1410", "05c", "1849", "727", "create", "1559", "536", "1106", "1310", "1944", "670", "1297", "1316", "1762", "en", "1148", "1295", "1551", "1853", "1890", "1208", "1784", "7200", "05f", "178", "1283", "1332", "381", "643", "1056", "1238", "2024", "2387", "179", "981", "1547", "1705", "05e", "290", "903", "1069", "1285", "2436", "062", "251", "560", "582", "719", "56", "1700", "2321", "325", "448", "613", "777", "791", "51", "488", "902", "Asia/Almaty", "is_hidden", "1398", "1527", "1893", "1999", "2367", "2642", "237", "busy", "065", "067", "233", "590", "993", "1511", "54", "723", "860", "363", "487", "522", "605", "995", "1321", "1691", "1865", "2447", "2462", "NON_TRANSACTIONAL", "433", "871", "432", "1004", "1207", "2032", "2050", "2379", "2446", "279", "636", "703", "904", "248", "370", "691", "700", "1068", "1655", "2334", "060", "063", "364", "533", "534", "567", "1191", "1210", "1473", "1827", "069", "701", "2531", "514", "prev_dhash", "064", "496", "790", "1046", "1139", "1505", "1521", "1108", "207", "544", "637", "final", "1173", "1293", "1694", "1939", "1951", "1993", "2353", "2515", "504", "601", "857", "modify", "spam_request", "p_121_aa_1101_test4", "866", "1427", "1502", "1638", "1744", "2153", "068", "382", "725", "1704", "1864", "1990", "2003", "Asia/Dubai", "508", "531", "1387", "1474", "1632", "2307", "2386", "819", "2014", "066", "387", "1468", "1706", "2186", "2261", "471", "728", "1147", "1372", "1961"]];
+export declare const SINGLE_BYTE_TOKENS: string[];
 export declare const TOKEN_MAP: {
     [token: string]: {
         dict?: number;