@genuxofficial/baileys 3.0.0 → 4.0.0

package/lib/Utils/messages-media.js

@@ -282,7 +282,7 @@ async function generateThumbnail(file, mediaType, options) {
         }
     }
     else if (mediaType === 'video') {
-        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageIDV2)() + '.jpg');
+        const imgFilename = (0, path_1.join)(getTmpFilesDirectory(), (0, generics_1.generateMessageID)() + '.jpg');
         try {
             await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 });
             const buff = await fs_1.promises.readFile(imgFilename);
@@ -307,34 +307,25 @@ exports.getHttpStream = getHttpStream;
 const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
-    const encFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-enc');
-    const encFileWriteStream = (0, fs_1.createWriteStream)(encFilePath);
-    let originalFilePath;
-    let didSaveToTmpPath = false;
     let bodyPath;
+    let didSaveToTmpPath = false;
     try {
         const buffer = await (0, exports.toBuffer)(stream);
-        // Write encrypted data
-        encFileWriteStream.write(buffer);
-        encFileWriteStream.end();
-        // Save original file if required
-        if (saveOriginalFileIfRequired) {
-            originalFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-original');
-            (0, fs_1.writeFileSync)(originalFilePath, buffer);
-            bodyPath = originalFilePath;
-            didSaveToTmpPath = true;
-        }
-        else if (type === 'file' && typeof media.url === 'string') {
+        if (type === 'file') {
             bodyPath = media.url;
         }
+        else if (saveOriginalFileIfRequired) {
+            bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
+            (0, fs_1.writeFileSync)(bodyPath, buffer);
+            didSaveToTmpPath = true;
+        }
         const fileLength = buffer.length;
         const fileSha256 = Crypto.createHash('sha256').update(buffer).digest();
         stream === null || stream === void 0 ? void 0 : stream.destroy();
-        logger === null || logger === void 0 ? void 0 : logger.debug('prepared stream data successfully');
+        logger === null || logger === void 0 ? void 0 : logger.debug('prepare stream data successfully');
         return {
             mediaKey: undefined,
-            encFilePath,
-            originalFilePath,
+            encWriteStream: buffer,
             fileLength,
             fileSha256,
             fileEncSha256: undefined,
@@ -343,17 +334,14 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
         };
     }
     catch (error) {
+        // destroy all streams with error
         stream.destroy();
-        try {
-            await fs_1.promises.unlink(encFilePath);
-        }
-        catch (_) { }
-        if (didSaveToTmpPath && bodyPath) {
+        if (didSaveToTmpPath) {
             try {
                 await fs_1.promises.unlink(bodyPath);
             }
             catch (err) {
-                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to delete tmp bodyPath');
+                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
             }
         }
         throw error;
@@ -361,29 +349,27 @@ const prepareStream = async (media, mediaType, { logger, saveOriginalFileIfRequi
 };
 exports.prepareStream = prepareStream;
 const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfRequired, opts } = {}) => {
-    var _a, _b;
     const { stream, type } = await (0, exports.getStream)(media, opts);
     logger === null || logger === void 0 ? void 0 : logger.debug('fetched media stream');
     const mediaKey = Crypto.randomBytes(32);
     const { cipherKey, iv, macKey } = await getMediaKeys(mediaKey, mediaType);
-    const encFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-enc');
-    const encFileWriteStream = (0, fs_1.createWriteStream)(encFilePath);
-    let originalFileStream;
-    let originalFilePath;
-    if (saveOriginalFileIfRequired) {
-        originalFilePath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageIDV2)() + '-original');
-        originalFileStream = (0, fs_1.createWriteStream)(originalFilePath);
+    const encWriteStream = new stream_1.Readable({ read: () => { } });
+    let bodyPath;
+    let writeStream;
+    let didSaveToTmpPath = false;
+    if (type === 'file') {
+        bodyPath = media.url;
+    }
+    else if (saveOriginalFileIfRequired) {
+        bodyPath = (0, path_1.join)(getTmpFilesDirectory(), mediaType + (0, generics_1.generateMessageID)());
+        writeStream = (0, fs_1.createWriteStream)(bodyPath);
+        didSaveToTmpPath = true;
     }
     let fileLength = 0;
     const aes = Crypto.createCipheriv('aes-256-cbc', cipherKey, iv);
     let hmac = Crypto.createHmac('sha256', macKey).update(iv);
     let sha256Plain = Crypto.createHash('sha256');
     let sha256Enc = Crypto.createHash('sha256');
-    const onChunk = (buff) => {
-        sha256Enc.update(buff);
-        hmac.update(buff);
-        encFileWriteStream.write(buff);
-    };
     try {
         for await (const data of stream) {
             fileLength += data.length;
@@ -394,12 +380,12 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
                     data: { media, type }
                 });
             }
-            if (originalFileStream) {
-                if (!originalFileStream.write(data)) {
-                    await (0, events_1.once)(originalFileStream, 'drain');
+            sha256Plain = sha256Plain.update(data);
+            if (writeStream) {
+                if (!writeStream.write(data)) {
+                    await (0, events_1.once)(writeStream, 'drain');
                 }
             }
-            sha256Plain.update(data);
             onChunk(aes.update(data));
         }
         onChunk(aes.final());
@@ -407,43 +393,46 @@ const encryptedStream = async (media, mediaType, { logger, saveOriginalFileIfReq
         sha256Enc = sha256Enc.update(mac);
         const fileSha256 = sha256Plain.digest();
         const fileEncSha256 = sha256Enc.digest();
-        //encWriteStream.push(mac)
-        //encWriteStream.push(null)
-        encFileWriteStream.write(mac);
-        encFileWriteStream.end();
-        (_a = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.end) === null || _a === void 0 ? void 0 : _a.call(originalFileStream);
+        encWriteStream.push(mac);
+        encWriteStream.push(null);
+        writeStream === null || writeStream === void 0 ? void 0 : writeStream.end();
         stream.destroy();
         logger === null || logger === void 0 ? void 0 : logger.debug('encrypted data successfully');
         return {
             mediaKey,
-            originalFilePath,
-            encFilePath,
+            encWriteStream,
+            bodyPath,
             mac,
             fileEncSha256,
             fileSha256,
-            fileLength
+            fileLength,
+            didSaveToTmpPath
         };
     }
     catch (error) {
         // destroy all streams with error
-        encFileWriteStream.destroy();
-        (_b = originalFileStream === null || originalFileStream === void 0 ? void 0 : originalFileStream.destroy) === null || _b === void 0 ? void 0 : _b.call(originalFileStream);
+        encWriteStream.destroy();
+        writeStream === null || writeStream === void 0 ? void 0 : writeStream.destroy();
         aes.destroy();
         hmac.destroy();
         sha256Plain.destroy();
         sha256Enc.destroy();
         stream.destroy();
-        try {
-            await fs_1.promises.unlink(encFilePath);
-            if (originalFilePath) {
-                await fs_1.promises.unlink(originalFilePath);
+        if (didSaveToTmpPath) {
+            try {
+                await fs_1.promises.unlink(bodyPath);
+            }
+            catch (err) {
+                logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed to save to tmp path');
             }
-        }
-        catch (err) {
-            logger === null || logger === void 0 ? void 0 : logger.error({ err }, 'failed deleting tmp files');
         }
         throw error;
     }
+    function onChunk(buff) {
+        sha256Enc = sha256Enc.update(buff);
+        hmac = hmac.update(buff);
+        encWriteStream.push(buff);
+    }
 };
 exports.encryptedStream = encryptedStream;
 const DEF_HOST = 'mmg.whatsapp.net';
@@ -564,19 +553,19 @@ function extensionForMediaMessage(message) {
 }
 exports.extensionForMediaMessage = extensionForMediaMessage;
 const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (filePath, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
+    return async (stream, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         var _a, _b;
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
-        /*const chunks: Buffer[] | Buffer = []
+        const chunks = [];
         if (!Buffer.isBuffer(stream)) {
             for await (const chunk of stream) {
-                chunks.push(chunk)
+                chunks.push(chunk);
             }
-        }*/
-        //const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks)
+        }
+        const reqBody = Buffer.isBuffer(stream) ? stream : Buffer.concat(chunks);
         fileEncSha256B64 = (0, exports.encodeBase64EncodedStringForUpload)(fileEncSha256B64);
         let media = Defaults_1.MEDIA_PATH_MAP[mediaType];
         if (newsletter) {
@@ -588,12 +577,11 @@ const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options },
             const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
-                //if(maxContentLengthBytes && reqBody.length > maxContentLengthBytes) {
-                //	throw new Boom(`Body too large for "${hostname}"`, { statusCode: 413 })
-                //}
-                const body = await axios_1.default.post(url, (0, fs_1.createReadStream)(filePath), {
+                if (maxContentLengthBytes && reqBody.length > maxContentLengthBytes) {
+                    throw new boom_1.Boom(`Body too large for "${hostname}"`, { statusCode: 413 });
+                }
+                const body = await axios_1.default.post(url, reqBody, {
                     ...options,
-                    maxRedirects: 0,
                     headers: {
                         ...options.headers || {},
                         'Content-Type': 'application/octet-stream',

package/lib/Utils/messages.js

@@ -81,17 +81,20 @@ const prepareWAMessageMedia = async (message, options) => {
         media: message[mediaType]
     };
     delete uploadData[mediaType];
+    // check if cacheable + generate cache key
     const cacheableKey = typeof uploadData.media === 'object' &&
-        'url' in uploadData.media &&
+        ('url' in uploadData.media) &&
         !!uploadData.media.url &&
-        !!options.mediaCache &&
-        (mediaType + ':' + uploadData.media.url.toString());
+        !!options.mediaCache && (
+    // generate the key
+    mediaType + ':' + uploadData.media.url.toString());
     if (mediaType === 'document' && !uploadData.fileName) {
         uploadData.fileName = 'file';
     }
     if (!uploadData.mimetype) {
         uploadData.mimetype = MIMETYPE_MAP[mediaType];
     }
+    // check for cache hit
     if (cacheableKey) {
         const mediaBuff = options.mediaCache.get(cacheableKey);
         if (mediaBuff) {
@@ -103,26 +106,28 @@ const prepareWAMessageMedia = async (message, options) => {
         }
     }
     const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined';
-    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined';
+    const requiresThumbnailComputation = (mediaType === 'image' || mediaType === 'video') &&
+        (typeof uploadData['jpegThumbnail'] === 'undefined');
     const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true;
     const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true;
     const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation;
-    const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
+    const { mediaKey, encWriteStream, bodyPath, fileEncSha256, fileSha256, fileLength, didSaveToTmpPath, } = await (options.newsletter ? messages_media_1.prepareStream : messages_media_1.encryptedStream)(uploadData.media, options.mediaTypeOverride || mediaType, {
         logger,
         saveOriginalFileIfRequired: requiresOriginalForSomeProcessing,
         opts: options.options
     });
+    // url safe Base64 encode the SHA256 hash of the body
     const fileEncSha256B64 = (options.newsletter ? fileSha256 : fileEncSha256 !== null && fileEncSha256 !== void 0 ? fileEncSha256 : fileSha256).toString('base64');
     const [{ mediaUrl, directPath, handle }] = await Promise.all([
         (async () => {
-            const result = await options.upload(encFilePath, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
+            const result = await options.upload(encWriteStream, { fileEncSha256B64, mediaType, timeoutMs: options.mediaUploadTimeoutMs });
             logger === null || logger === void 0 ? void 0 : logger.debug({ mediaType, cacheableKey }, 'uploaded media');
             return result;
         })(),
         (async () => {
             try {
                 if (requiresThumbnailComputation) {
-                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(originalFilePath, mediaType, options);
+                    const { thumbnail, originalImageDimensions } = await (0, messages_media_1.generateThumbnail)(bodyPath, mediaType, options);
                     uploadData.jpegThumbnail = thumbnail;
                     if (!uploadData.width && originalImageDimensions) {
                         uploadData.width = originalImageDimensions.width;
@@ -132,11 +137,11 @@ const prepareWAMessageMedia = async (message, options) => {
                     logger === null || logger === void 0 ? void 0 : logger.debug('generated thumbnail');
                 }
                 if (requiresDurationComputation) {
-                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(originalFilePath);
+                    uploadData.seconds = await (0, messages_media_1.getAudioDuration)(bodyPath);
                     logger === null || logger === void 0 ? void 0 : logger.debug('computed audio duration');
                 }
                 if (requiresWaveformProcessing) {
-                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(originalFilePath, logger);
+                    uploadData.waveform = await (0, messages_media_1.getAudioWaveform)(bodyPath, logger);
                     logger === null || logger === void 0 ? void 0 : logger.debug('processed waveform');
                 }
                 if (requiresAudioBackground) {
@@ -150,15 +155,19 @@ const prepareWAMessageMedia = async (message, options) => {
         })(),
     ])
         .finally(async () => {
-        try {
-            await fs_1.promises.unlink(encFilePath);
-            if (originalFilePath) {
-                await fs_1.promises.unlink(originalFilePath);
-            }
-            logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp files');
+        if (!Buffer.isBuffer(encWriteStream)) {
+            encWriteStream.destroy();
         }
-        catch (error) {
-            logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+        // remove tmp files
+        if (didSaveToTmpPath && bodyPath) {
+            try {
+                await fs_1.promises.access(bodyPath);
+                await fs_1.promises.unlink(bodyPath);
+                logger === null || logger === void 0 ? void 0 : logger.debug('removed tmp file');
+            }
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.warn('failed to remove tmp file');
+            }
         }
     });
     const obj = Types_1.WAProto.Message.fromObject({
@@ -265,10 +274,6 @@ const generateWAMessageContent = async (message, options) => {
             extContent.font = options.font;
         }
         m.extendedTextMessage = extContent;
-        //WhatsApp always sends secretMessage along with the text message
-        m.messageContextInfo = {
-            messageSecret: (0, crypto_1.randomBytes)(32)
-        };
     }
     else if ('contacts' in message) {
         const contactLen = message.contacts.contacts.length;
@@ -728,7 +733,7 @@ const generateWAMessageFromContent = (jid, message, options) => {
         key: {
             remoteJid: jid,
             fromMe: true,
-            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageIDV2)(),
+            id: (options === null || options === void 0 ? void 0 : options.messageId) || (0, generics_1.generateMessageID)(),
         },
         message: message,
         messageTimestamp: timestamp,
@@ -792,10 +797,7 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV4)
             || (message === null || message === void 0 ? void 0 : message.pollCreationMessageV5)
             || (message === null || message === void 0 ? void 0 : message.statusAddYours)
-            || (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.groupStatusMessage));
     }
 };
 exports.normalizeMessageContent = normalizeMessageContent;
@@ -951,13 +953,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

@@ -4,9 +4,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/use-multi-file-auth-state.js

@@ -1,26 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMultiFileAuthState = void 0;
-const async_mutex_1 = require("async-mutex");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 const WAProto_1 = require("../../WAProto");
 const auth_utils_1 = require("./auth-utils");
 const generics_1 = require("./generics");
-// We need to lock files due to the fact that we are using async functions to read and write files
-// https://github.com/WhiskeySockets/Baileys/issues/794
-// https://github.com/nodejs/node/issues/26338
-// Use a Map to store mutexes for each file path
-const fileLocks = new Map();
-// Get or create a mutex for a specific file path
-const getFileLock = (path) => {
-    let mutex = fileLocks.get(path);
-    if (!mutex) {
-        mutex = new async_mutex_1.Mutex();
-        fileLocks.set(path, mutex);
-    }
-    return mutex;
-};
+const async_lock_1 = __importDefault(require("async-lock"));
+const fileLock = new async_lock_1.default({ maxPending: Infinity });
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -29,32 +19,15 @@ const getFileLock = (path) => {
  * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
  * */
 const useMultiFileAuthState = async (folder) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const writeData = async (data, file) => {
+    const writeData = (data, file) => {
         const filePath = (0, path_1.join)(folder, fixFileName(file));
-        const mutex = getFileLock(filePath);
-        return mutex.acquire().then(async (release) => {
-            try {
-                await (0, promises_1.writeFile)(filePath, JSON.stringify(data, generics_1.BufferJSON.replacer));
-            }
-            finally {
-                release();
-            }
-        });
+        return fileLock.acquire(filePath, () => (0, promises_1.writeFile)((0, path_1.join)(filePath), JSON.stringify(data, generics_1.BufferJSON.replacer)));
     };
     const readData = async (file) => {
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
-            const mutex = getFileLock(filePath);
-            return await mutex.acquire().then(async (release) => {
-                try {
-                    const data = await (0, promises_1.readFile)(filePath, { encoding: 'utf-8' });
-                    return JSON.parse(data, generics_1.BufferJSON.reviver);
-                }
-                finally {
-                    release();
-                }
-            });
+            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;
@@ -63,17 +36,7 @@ const useMultiFileAuthState = async (folder) => {
     const removeData = async (file) => {
         try {
             const filePath = (0, path_1.join)(folder, fixFileName(file));
-            const mutex = getFileLock(filePath);
-            return mutex.acquire().then(async (release) => {
-                try {
-                    await (0, promises_1.unlink)(filePath);
-                }
-                catch (_a) {
-                }
-                finally {
-                    release();
-                }
-            });
+            await fileLock.acquire(filePath, () => (0, promises_1.unlink)(filePath));
         }
         catch (_a) {
         }
@@ -117,7 +80,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
             }
         },
-        saveCreds: async () => {
+        saveCreds: () => {
             return writeData(creds, 'creds.json');
         }
     };

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,
+        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 = {

package/lib/WABinary/constants.js

@@ -30,11 +30,11 @@ exports.SINGLE_BYTE_TOKENS = [
     '', 'xmlstreamstart', 'xmlstreamend', 's.whatsapp.net', 'type', 'participant', 'from', 'receipt', 'id', 'broadcast', 'status', 'message', 'notification', 'notify', 'to', 'jid', 'user', 'class', 'offline', 'g.us', 'result', 'mediatype', 'enc', 'skmsg', 'off_cnt', 'xmlns', 'presence', 'participants', 'ack', 't', 'iq', 'device_hash', 'read', 'value', 'media', 'picture', 'chatstate', 'unavailable', 'text', 'urn:xmpp:whatsapp:push', 'devices', 'verified_name', 'contact', 'composing', 'edge_routing', 'routing_info', 'item', 'image', 'verified_level', 'get', 'fallback_hostname', '2', 'media_conn', '1', 'v', 'handshake', 'fallback_class', 'count', 'config', 'offline_preview', 'download_buckets', 'w:profile:picture', 'set', 'creation', 'location', 'fallback_ip4', 'msg', 'urn:xmpp:ping', 'fallback_ip6', 'call-creator', 'relaylatency', 'success', 'subscribe', 'video', 'business_hours_config', 'platform', 'hostname', 'version', 'unknown', '0', 'ping', 'hash', 'edit', 'subject', 'max_buckets', 'download', 'delivery', 'props', 'sticker', 'name', 'last', 'contacts', 'business', 'primary', 'preview', 'w:p', 'pkmsg', 'call-id', 'retry', 'prop', 'call', 'auth_ttl', 'available', 'relay_id', 'last_id', 'day_of_week', 'w', 'host', 'seen', 'bits', 'list', 'atn', 'upload', 'is_new', 'w:stats', 'key', 'paused', 'specific_hours', 'multicast', 'stream:error', 'mmg.whatsapp.net', 'code', 'deny', 'played', 'profile', 'fna', 'device-list', 'close_time', 'latency', 'gcm', 'pop', 'audio', '26', 'w:web', 'open_time', 'error', 'auth', 'ip4', 'update', 'profile_options', 'config_value', 'category', 'catalog_not_created', '00', 'config_code', 'mode', 'catalog_status', 'ip6', 'blocklist', 'registration', '7', 'web', 'fail', 'w:m', 'cart_enabled', 'ttl', 'gif', '300', 'device_orientation', 'identity', 'query', '401', 'media-gig2-1.cdn.whatsapp.net', 'in', '3', 'te2', 'add', 'fallback', 'categories', 'ptt', 'encrypt', 'notice', 'thumbnail-document', 'item-not-found', '12', 'thumbnail-image', 'stage', 'thumbnail-link', 'usync', 'out', 'thumbnail-video', '8', '01', 'context', 'sidelist', 'thumbnail-gif', 'terminate', 'not-authorized', 'orientation', 'dhash', 'capability', 'side_list', 'md-app-state', 'description', 'serial', 'readreceipts', 'te', 'business_hours', 'md-msg-hist', 'tag', 'attribute_padding', 'document', 'open_24h', 'delete', 'expiration', 'active', 'prev_v_id', 'true', 'passive', 'index', '4', 'conflict', 'remove', 'w:gp2', 'config_expo_key', 'screen_height', 'replaced', '02', 'screen_width', 'uploadfieldstat', '2:47DEQpj8', 'media-bog1-1.cdn.whatsapp.net', 'encopt', 'url', 'catalog_exists', 'keygen', 'rate', 'offer', 'opus', 'media-mia3-1.cdn.whatsapp.net', 'privacy', 'media-mia3-2.cdn.whatsapp.net', 'signature', 'preaccept', 'token_id', 'media-eze1-1.cdn.whatsapp.net'
 ];
 exports.TOKEN_MAP = {};
-for (const [i, SINGLE_BYTE_TOKEN] of exports.SINGLE_BYTE_TOKENS.entries()) {
-    exports.TOKEN_MAP[SINGLE_BYTE_TOKEN] = { index: i };
+for (let i = 0; i < exports.SINGLE_BYTE_TOKENS.length; i++) {
+    exports.TOKEN_MAP[exports.SINGLE_BYTE_TOKENS[i]] = { index: i };
 }
-for (const [i, DOUBLE_BYTE_TOKEN] of exports.DOUBLE_BYTE_TOKENS.entries()) {
-    for (const [j, element] of DOUBLE_BYTE_TOKEN.entries()) {
-        exports.TOKEN_MAP[element] = { dict: i, index: j };
+for (let i = 0; i < exports.DOUBLE_BYTE_TOKENS.length; i++) {
+    for (let j = 0; j < exports.DOUBLE_BYTE_TOKENS[i].length; j++) {
+        exports.TOKEN_MAP[exports.DOUBLE_BYTE_TOKENS[i][j]] = { dict: i, index: j };
     }
 }