@queenanya/baileys 8.2.7 → 8.3.2

package/lib/Utils/messages-media.d.ts

@@ -9,31 +9,24 @@ import { ILogger } from './logger';
 export declare const hkdfInfoKey: (type: MediaType) => string;
 /** generates all the keys required to encrypt/decrypt & sign a media message */
 export declare function getMediaKeys(buffer: Uint8Array | string | null | undefined, mediaType: MediaType): Promise<MediaDecryptionKeyInfo>;
+export declare function uploadFile(buffer: Buffer, logger?: ILogger): Promise<string>;
+export declare function vid2jpg(videoUrl: string): Promise<string>;
+/**
+ * Originally written by Techwiz (https://github.com/techwiz37)
+ * Modified for customization and improvements
+ */
+export declare const extractVideoThumb: (videoPath: string) => Promise<Buffer<ArrayBufferLike>>;
 export declare const extractImageThumb: (bufferOrFilePath: Readable | Buffer | string, width?: number) => Promise<{
     buffer: Buffer<ArrayBufferLike>;
     original: {
-        width: number | undefined;
-        height: number | undefined;
+        width: number;
+        height: number;
     };
 }>;
 export declare const encodeBase64EncodedStringForUpload: (b64: string) => string;
 export declare const generateProfilePicture: (mediaUpload: WAMediaUpload) => Promise<{
     img: Buffer<ArrayBufferLike>;
 }>;
-export declare const generateProfilePictureFull: (img: any) => Promise<{
-    img: any;
-}>;
-export declare const generateProfilePictureFP: (buffer: any) => Promise<{
-    img: any;
-    preview: any;
-}>;
-export declare const generatePP: (buffer: any) => Promise<{
-    img: any;
-    preview: any;
-}>;
-export declare const changeprofileFull: (img: any) => Promise<{
-    img: any;
-}>;
 /** gets the SHA256 of the given media message */
 export declare const mediaMessageSHA256B64: (message: WAMessageContent) => string | null | undefined;
 export declare function getAudioDuration(buffer: Buffer | string | Readable): Promise<number | undefined>;

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];
@@ -259,20 +337,17 @@ exports.mediaMessageSHA256B64 = mediaMessageSHA256B64;
 async function getAudioDuration(buffer) {
     const musicMetadata = await Promise.resolve().then(() => __importStar(require('music-metadata')));
     let metadata;
+    const options = {
+        duration: true
+    };
     if (Buffer.isBuffer(buffer)) {
-        metadata = await musicMetadata.parseBuffer(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseBuffer(buffer, undefined, options);
     }
     else if (typeof buffer === 'string') {
-        const rStream = (0, fs_1.createReadStream)(buffer);
-        try {
-            metadata = await musicMetadata.parseStream(rStream, undefined, { duration: true });
-        }
-        finally {
-            rStream.destroy();
-        }
+        metadata = await musicMetadata.parseFile(buffer, options);
     }
     else {
-        metadata = await musicMetadata.parseStream(buffer, undefined, { duration: true });
+        metadata = await musicMetadata.parseStream(buffer, undefined, options);
     }
     return metadata.format.duration;
 }
@@ -362,11 +437,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 +519,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 +542,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));
         }
@@ -520,7 +604,11 @@ const toSmallestChunkSize = (num) => {
 const getUrlFromDirectPath = (directPath) => `https://${DEF_HOST}${directPath}`;
 exports.getUrlFromDirectPath = getUrlFromDirectPath;
 const downloadContentFromMessage = async ({ mediaKey, directPath, url }, type, opts = {}) => {
-    const downloadUrl = url || (0, exports.getUrlFromDirectPath)(directPath);
+    const isValidMediaUrl = url === null || url === void 0 ? void 0 : url.startsWith('https://mmg.whatsapp.net/');
+    const downloadUrl = isValidMediaUrl ? url : (0, exports.getUrlFromDirectPath)(directPath);
+    if (!downloadUrl) {
+        throw new boom_1.Boom('No valid media URL or directPath present in message', { statusCode: 400 });
+    }
     const keys = await getMediaKeys(mediaKey, type);
     return (0, exports.downloadEncryptedContent)(downloadUrl, keys, opts);
 };

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;
@@ -437,12 +434,12 @@ const generateWAMessageContent = async (message, options) => {
             m.pollCreationMessageV2 = pollCreationMessage;
         }
         else {
-            if (message.poll.selectableCount > 0) {
+            if (message.poll.selectableCount === 1) {
                 // poll v3 is for single select polls
                 m.pollCreationMessageV3 = pollCreationMessage;
             }
             else {
-                // poll v3 for multiple choice polls
+                // poll for multiple choice polls
                 m.pollCreationMessage = pollCreationMessage;
             }
         }
@@ -502,6 +499,14 @@ const generateWAMessageContent = async (message, options) => {
     else if ('requestPhoneNumber' in message) {
         m.requestPhoneNumberMessage = {};
     }
+    else if ('album' in message) {
+        const imageMessages = message.album.filter(item => 'image' in item);
+        const videoMessages = message.album.filter(item => 'video' in item);
+        m.albumMessage = WAProto_1.proto.Message.AlbumMessage.fromObject({
+            expectedImageCount: imageMessages.length,
+            expectedVideoCount: videoMessages.length,
+        });
+    }
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
@@ -566,7 +571,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 +809,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 +884,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 +965,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/use-single-file-auth-state.d.ts

@@ -0,0 +1,5 @@
+import { AuthenticationState } from '../Types/index';
+export declare const useSingleFileAuthState: (filepath: string) => Promise<{
+    state: AuthenticationState;
+    saveCreds: () => Promise<void>;
+}>;

package/lib/Utils/use-single-file-auth-state.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useSingleFileAuthState = void 0;
+const async_lock_1 = __importDefault(require("async-lock"));
+const promises_1 = require("fs/promises");
+const index_1 = require("../../WAProto/index");
+const auth_utils_1 = require("./auth-utils");
+const generics_1 = require("./generics");
+const fileLock = new async_lock_1.default({ maxPending: Infinity });
+const useSingleFileAuthState = async (filepath) => {
+    const filePath = filepath + '.json';
+    const writeData = (data) => {
+        return fileLock.acquire(filePath, () => (0, promises_1.writeFile)(filePath, JSON.stringify(data, generics_1.BufferJSON.replacer)));
+    };
+    const readData = async () => {
+        try {
+            const data = await fileLock.acquire(filePath, () => (0, promises_1.readFile)(filePath, { encoding: 'utf-8' }));
+            return JSON.parse(data, generics_1.BufferJSON.reviver);
+        }
+        catch (error) {
+            return null;
+        }
+    };
+    const fileInfo = await (0, promises_1.stat)(filePath).catch(() => null);
+    if (fileInfo && !fileInfo.isFile()) {
+        throw new Error(`A non-file exists at ${filePath}, please delete it or specify a different path.`);
+    }
+    // Initialize with default credentials if the file is empty or doesn't exist
+    const { creds = (0, auth_utils_1.initAuthCreds)(), keys = {} } = await readData() || {};
+    return {
+        state: {
+            creds,
+            keys: {
+                get: async (type, ids) => {
+                    const data = {};
+                    for (const id of ids) {
+                        const value = keys[`${type}-${id}`];
+                        data[id] = type === 'app-state-sync-key' && value
+                            ? index_1.proto.Message.AppStateSyncKeyData.fromObject(value)
+                            : value;
+                    }
+                    return data;
+                },
+                set: async (data) => {
+                    for (const category in data) {
+                        for (const id in data[category]) {
+                            const value = data[category][id];
+                            if (value) {
+                                keys[`${category}-${id}`] = value;
+                            }
+                            else {
+                                delete keys[`${category}-${id}`];
+                            }
+                        }
+                    }
+                    await writeData({ creds, keys });
+                }
+            }
+        },
+        saveCreds: () => writeData({ creds, keys })
+    };
+};
+exports.useSingleFileAuthState = useSingleFileAuthState;

package/lib/Utils/validate-connection.js

@@ -22,7 +22,7 @@ const getUserAgent = (config) => {
         device: 'Desktop',
         osBuildNumber: '0.1',
         localeLanguageIso6391: 'en',
-        localeCountryIso31661Alpha2: config.countryCode
+        localeCountryIso31661Alpha2: 'US'
     };
 };
 const PLATFORM_MAP = {
@@ -103,21 +103,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);