alipclutch-baileys 8.5.4 → 8.5.5

package/lib/Socket/socket.js

@@ -20,15 +20,16 @@ const Client_1 = require("./Client");
 const makeSocket = (config) => {
     var _a, _b;
     const { waWebSocketUrl, connectTimeoutMs, logger, keepAliveIntervalMs, browser, auth: authState, printQRInTerminal, defaultQueryTimeoutMs, transactionOpts, qrTimeout, makeSignalRepository, } = config;
-    let url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
-    config.mobile = config.mobile || url.protocol === 'tcp:';
-    if (config.mobile && url.protocol !== 'tcp:') {
-        url = new url_1.URL(`tcp://${Defaults_1.MOBILE_ENDPOINT}:${Defaults_1.MOBILE_PORT}`);
+    const url = typeof waWebSocketUrl === 'string' ? new url_1.URL(waWebSocketUrl) : waWebSocketUrl;
+    if (config.mobile || url.protocol === 'tcp:') {
+        throw new boom_1.Boom('Mobile API is not supported anymore', { 
+            statusCode: Types_1.DisconnectReason.loggedOut 
+        });
     }
-    if (!config.mobile && url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
+    if (url.protocol === 'wss' && ((_a = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _a === void 0 ? void 0 : _a.routingInfo)) {
         url.searchParams.append('ED', authState.creds.routingInfo.toString('base64url'));
     }
-    const ws = config.socket ? config.socket : config.mobile ? new Client_1.MobileSocketClient(url, config) : new Client_1.WebSocketClient(url, config);
+    const ws = new Client_1.WebSocketClient(url, config);
     ws.connect();
     const ev = (0, Utils_1.makeEventBuffer)(logger);
     /** ephemeral key pair used to encrypt/decrypt communication. Unique for each connection */
@@ -36,8 +37,7 @@ const makeSocket = (config) => {
     /** WA noise protocol wrapper */
     const noise = (0, Utils_1.makeNoiseHandler)({
         keyPair: ephemeralKeyPair,
-        NOISE_HEADER: config.mobile ? Defaults_1.MOBILE_NOISE_HEADER : Defaults_1.NOISE_WA_HEADER,
-        mobile: config.mobile,
+        NOISE_HEADER: Defaults_1.NOISE_WA_HEADER,
         logger,
         routingInfo: (_b = authState === null || authState === void 0 ? void 0 : authState.creds) === null || _b === void 0 ? void 0 : _b.routingInfo
     });
@@ -80,6 +80,25 @@ const makeSocket = (config) => {
     /** log & process any unexpected errors */
     const onUnexpectedError = (err, msg) => {
         logger.error({ err }, `unexpected error in '${msg}'`);
+        const message = (err && ((err.stack || err.message) || String(err))).toLowerCase();
+        // auto recover from cryptographic desyncs by re-uploading prekeys
+        if (message.includes('bad mac') || (message.includes('mac') && message.includes('invalid'))) {
+            try {
+                uploadPreKeysToServerIfRequired(true)
+                    .catch(e => logger.warn({ e }, 'failed to re-upload prekeys after bad mac'));
+            }
+            catch (_e) {
+                // ignore
+            }
+        }
+        // gently back off when encountering rate limits (429)
+        if (message.includes('429') || message.includes('rate limit')) {
+            const wait = Math.min(30000, (config.backoffDelayMs || 5000));
+            logger.info({ wait }, 'backing off due to rate limit');
+            setTimeout(() => {
+                // intentionally empty; wait to delay further sends
+            }, wait);
+        }
     };
     /** await the next incoming message */
     const awaitNextMessage = async (sendMsg) => {
@@ -116,7 +135,7 @@ const makeSocket = (config) => {
         let onRecv;
         let onErr;
         try {
-            return await (0, Utils_1.promiseTimeout)(timeoutMs, (resolve, reject) => {
+            const result = await (0, Utils_1.promiseTimeout)(timeoutMs, (resolve, reject) => {
                 onRecv = resolve;
                 onErr = err => {
                     reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
@@ -125,6 +144,7 @@ const makeSocket = (config) => {
                 ws.on('close', onErr); // if the socket closes, you'll never receive the message
                 ws.off('error', onErr);
             });
+            return result;
         }
         finally {
             ws.off(`TAG:${msgId}`, onRecv);
@@ -138,9 +158,10 @@ const makeSocket = (config) => {
             node.attrs.id = generateMessageTag();
         }
         const msgId = node.attrs.id;
-        const wait = waitForMessage(msgId, timeoutMs);
-        await sendNode(node);
-        const result = await wait;
+        const [result] = await Promise.all([
+            waitForMessage(msgId, timeoutMs),
+            sendNode(node)
+        ]);
         if ('tag' in result) {
             (0, WABinary_1.assertNodeErrorFree)(result);
         }
@@ -157,12 +178,9 @@ const makeSocket = (config) => {
         const result = await awaitNextMessage(init);
         const handshake = WAProto_1.proto.HandshakeMessage.decode(result);
         logger.trace({ handshake }, 'handshake recv from WA');
-        const keyEnc = noise.processHandshake(handshake, creds.noiseKey);
+        const keyEnc = await noise.processHandshake(handshake, creds.noiseKey);
         let node;
-        if (config.mobile) {
-            node = (0, Utils_1.generateMobileNode)(config);
-        }
-        else if (!creds.me) {
+        if (!creds.me) {
             node = (0, Utils_1.generateRegistrationNode)(creds, config);
             logger.info({ node }, 'not logged in, attempting registration...');
         }
@@ -232,11 +250,11 @@ const makeSocket = (config) => {
                 const l0 = frame.tag;
                 const l1 = frame.attrs || {};
                 const l2 = Array.isArray(frame.content) ? (_a = frame.content[0]) === null || _a === void 0 ? void 0 : _a.tag : '';
-                Object.keys(l1).forEach(key => {
+                for (const key of Object.keys(l1)) {
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]},${l2}`, frame) || anyTriggered;
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}:${l1[key]}`, frame) || anyTriggered;
                     anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},${key}`, frame) || anyTriggered;
-                });
+                }
                 anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0},,${l2}`, frame) || anyTriggered;
                 anyTriggered = ws.emit(`${Defaults_1.DEF_CALLBACK_PREFIX}${l0}`, frame) || anyTriggered;
                 if (!anyTriggered && logger.level === 'debug') {
@@ -365,11 +383,11 @@ const makeSocket = (config) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    /** This method was created by snowi, and implemented by KyuuRzy */
     
+    /** This method was created by snowi, and implemented by KyuuRzy */
     /** hey bro, if you delete this text */
     /** you are the most cursed human being who likes to claim other people's property 😹🙌🏻 */
-    const requestPairingCode = async (phoneNumber, pairKey = "DENZYMOD") => {
+    const requestPairingCode = async (phoneNumber, pairKey) => {
         if (pairKey) {
             authState.creds.pairingCode = pairKey.toUpperCase();
         } else {
@@ -431,12 +449,11 @@ const makeSocket = (config) => {
         });
         
         return authState.creds.pairingCode;
-    };
-    
+    }
     async function generatePairingKey() {
         const salt = (0, crypto_1.randomBytes)(32);
         const randomIv = (0, crypto_1.randomBytes)(16);
-        const key = (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
+        const key = await (0, Utils_1.derivePairingCodeKey)(authState.creds.pairingCode, salt);
         const ciphered = (0, Utils_1.aesEncryptCTR)(authState.creds.pairingEphemeralKeyPair.public, key, randomIv);
         return Buffer.concat([salt, randomIv, ciphered]);
     }
@@ -523,12 +540,18 @@ const makeSocket = (config) => {
     });
     // login complete
     ws.on('CB:success', async (node) => {
-        await uploadPreKeysToServerIfRequired();
-        await sendPassiveIq('active');
-        logger.info('opened connection to WA');
-        clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
-        ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
-        ev.emit('connection.update', { connection: 'open' });
+        try {
+            await uploadPreKeysToServerIfRequired();
+            await sendPassiveIq('active');
+            logger.info('opened connection to WA');
+            clearTimeout(qrTimer); // will never happen in all likelyhood -- but just in case WA sends success on first try
+            ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
+            ev.emit('connection.update', { connection: 'open' });
+        }
+        catch (err) {
+            logger.error({ err }, 'error opening connection');
+            end(err);
+        }
     });
     ws.on('CB:stream:error', (node) => {
         logger.error({ node }, 'stream errored out');
@@ -543,11 +566,20 @@ const makeSocket = (config) => {
     ws.on('CB:ib,,downgrade_webclient', () => {
         end(new boom_1.Boom('Multi-device beta not joined', { statusCode: Types_1.DisconnectReason.multideviceMismatch }));
     });
+    ws.on('CB:ib,,offline_preview', (node) => {
+        logger.info('offline preview received', JSON.stringify(node));
+        sendNode({
+            tag: 'ib',
+            attrs: {},
+            content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
+        });
+    });
     ws.on('CB:ib,,edge_routing', (node) => {
         const edgeRoutingNode = (0, WABinary_1.getBinaryNodeChild)(node, 'edge_routing');
         const routingInfo = (0, WABinary_1.getBinaryNodeChild)(edgeRoutingNode, 'routing_info');
         if (routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content) {
             authState.creds.routingInfo = Buffer.from(routingInfo === null || routingInfo === void 0 ? void 0 : routingInfo.content);
+            ev.emit('creds.update', authState.creds);
         }
     });
     let didStartBuffer = false;
@@ -596,7 +628,10 @@ const makeSocket = (config) => {
         type: 'md',
         ws,
         ev,
-        authState: { creds, keys },
+        authState: {
+            creds,
+            keys 
+        },
         signalRepository,
         get user() {
             return authState.creds.me;

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

@@ -1,11 +1,21 @@
 "use strict";
 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");
+const fileLocks = new Map();
+const getFileLock = (path) => {
+    let mutex = fileLocks.get(path);
+    if (!mutex) {
+        mutex = new async_mutex_1.Mutex();
+        fileLocks.set(path, mutex);
+    }
+    return mutex;
+};
 /**
  * stores the full authentication state in a single folder.
  * Far more efficient than singlefileauthstate
@@ -14,13 +24,31 @@ const generics_1 = require("./generics");
  * Would recommend writing an auth state for use with a proper SQL or No-SQL DB
  * */
 const useMultiFileAuthState = async (folder) => {
-    const writeData = (data, file) => {
-        return (0, promises_1.writeFile)((0, path_1.join)(folder, fixFileName(file)), JSON.stringify(data, generics_1.BufferJSON.replacer));
+    const writeData = async (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();
+            }
+        });
     };
     const readData = async (file) => {
         try {
-            const data = await (0, promises_1.readFile)((0, path_1.join)(folder, fixFileName(file)), { encoding: 'utf-8' });
-            return JSON.parse(data, generics_1.BufferJSON.reviver);
+            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();
+                }
+            });
         }
         catch (error) {
             return null;
@@ -28,7 +56,18 @@ const useMultiFileAuthState = async (folder) => {
     };
     const removeData = async (file) => {
         try {
-            await (0, promises_1.unlink)((0, path_1.join)(folder, fixFileName(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.unlink)(filePath);
+                }
+                catch (_a) {
+                }
+                finally {
+                    release();
+                }
+            });
         }
         catch (_a) {
         }
@@ -72,7 +111,7 @@ const useMultiFileAuthState = async (folder) => {
                 }
             }
         },
-        saveCreds: () => {
+        saveCreds: async () => {
             return writeData(creds, 'creds.json');
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alipclutch-baileys",
-  "version": "8.5.4",
+  "version": "8.5.5",
   "description": "Modified WhatsApp Web API Library",
   "keywords": [
     "baileys",