wileys 0.4.2 → 0.4.4

package/lib/Socket/messages-send.js

@@ -773,7 +773,6 @@ const makeMessagesSocket = (config) => {
                     await relayMessage(jid, mediaMsg.message, {
                         messageId: mediaMsg.key.id
                     });
-                    await new Promise(resolve => setTimeout(resolve, 800));
                 }
                 return albumMsg;
             }

package/lib/Socket/socket.js

@@ -89,14 +89,6 @@ const makeSocket = (config) => {
                 // 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) => {
@@ -134,20 +126,33 @@ const makeSocket = (config) => {
         let onErr;
         try {
             const result = await (0, Utils_1.promiseTimeout)(timeoutMs, (resolve, reject) => {
-                onRecv = resolve;
+                onRecv = data => {
+                    resolve(data);
+                };
                 onErr = err => {
                     reject(err || new boom_1.Boom('Connection Closed', { statusCode: Types_1.DisconnectReason.connectionClosed }));
                 };
                 ws.on(`TAG:${msgId}`, onRecv);
                 ws.on('close', onErr); // if the socket closes, you'll never receive the message
-                ws.off('error', onErr);
+                ws.on('error', onErr);
+                return () => reject(new boom_1.Boom('Query Cancelled'));
             });
             return result;
         }
+        catch (error) {
+            if ((error === null || error === void 0 ? void 0 : error.isBoom) && ((error === null || error === void 0 ? void 0 : error.output) === null || (error === null || error === void 0 ? void 0 : error.output) === void 0 ? void 0 : error.output.statusCode) === Types_1.DisconnectReason.timedOut) {
+                logger === null || logger === void 0 ? void 0 : logger.warn({ msgId }, 'timed out waiting for message');
+                return undefined;
+            }
+            throw error;
+        }
         finally {
-            ws.off(`TAG:${msgId}`, onRecv);
-            ws.off('close', onErr); // if the socket closes, you'll never receive the message
-            ws.off('error', onErr);
+            if (onRecv)
+                ws.off(`TAG:${msgId}`, onRecv);
+            if (onErr) {
+                ws.off('close', onErr); // if the socket closes, you'll never receive the message
+                ws.off('error', onErr);
+            }
         }
     };
     /** send a query, and wait for its response. auto-generates message ID if not provided */
@@ -156,11 +161,13 @@ const makeSocket = (config) => {
             node.attrs.id = generateMessageTag();
         }
         const msgId = node.attrs.id;
-        const [result] = await Promise.all([
-            waitForMessage(msgId, timeoutMs),
+        const result = await (0, Utils_1.promiseTimeout)(timeoutMs, async (resolve, reject) => {
+            const wait = waitForMessage(msgId, timeoutMs).catch(reject);
             sendNode(node)
-        ]);
-        if ('tag' in result) {
+                .then(async () => resolve(await wait))
+                .catch(reject);
+        });
+        if (result && 'tag' in result) {
             (0, WABinary_1.assertNodeErrorFree)(result);
         }
         return result;
@@ -381,13 +388,13 @@ const makeSocket = (config) => {
         }
         end(new boom_1.Boom(msg || 'Intentional Logout', { statusCode: Types_1.DisconnectReason.loggedOut }));
     };
-    const requestPairingCode = async (phoneNumber, pairKey = "YUPRADEV") => {
-        if (pairKey) {
-            authState.creds.pairingCode = pairKey.toUpperCase();
-        }
-        else {
-            authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
+    const requestPairingCode = async (phoneNumber, pairKey) => {
+        await waitForSocketOpen();
+        const pairingCode = pairKey || (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5));
+        if (pairKey && pairKey.length !== 8) {
+            throw new Error('Custom pairing code must be exactly 8 chars');
         }
+        authState.creds.pairingCode = pairingCode.toUpperCase();
         authState.creds.me = {
             id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
             name: '~'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wileys",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "WhatsApp Web API Library",
   "keywords": [
     "wileys",