wileys 0.4.3 → 0.4.5

package/lib/Socket/socket.js

@@ -126,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.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 */
@@ -375,65 +388,81 @@ 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) => {
+        var _a, _b;
+        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: '~'
         };
         ev.emit('creds.update', authState.creds);
-        await sendNode({
-            tag: 'iq',
-            attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
-                type: 'set',
-                id: generateMessageTag(),
-                xmlns: 'md'
-            },
-            content: [
-                {
-                    tag: 'link_code_companion_reg',
+        const maxRetries = 2;
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            try {
+                await waitForSocketOpen();
+                await sendNode({
+                    tag: 'iq',
                     attrs: {
-                        jid: authState.creds.me.id,
-                        stage: 'companion_hello',
-                        // eslint-disable-next-line camelcase
-                        should_show_push_notification: 'true'
+                        to: WABinary_1.S_WHATSAPP_NET,
+                        type: 'set',
+                        id: generateMessageTag(),
+                        xmlns: 'md'
                     },
                     content: [
                         {
-                            tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
-                            attrs: {},
-                            content: await generatePairingKey()
-                        },
-                        {
-                            tag: 'companion_server_auth_key_pub',
-                            attrs: {},
-                            content: authState.creds.noiseKey.public
-                        },
-                        {
-                            tag: 'companion_platform_id',
-                            attrs: {},
-                            content: (0, Utils_1.getPlatformId)(browser[1])
-                        },
-                        {
-                            tag: 'companion_platform_display',
-                            attrs: {},
-                            content: `${browser[1]} (${browser[0]})`
-                        },
-                        {
-                            tag: 'link_code_pairing_nonce',
-                            attrs: {},
-                            content: '0'
+                            tag: 'link_code_companion_reg',
+                            attrs: {
+                                jid: authState.creds.me.id,
+                                stage: 'companion_hello',
+                                // eslint-disable-next-line camelcase
+                                should_show_push_notification: 'true'
+                            },
+                            content: [
+                                {
+                                    tag: 'link_code_pairing_wrapped_companion_ephemeral_pub',
+                                    attrs: {},
+                                    content: await generatePairingKey()
+                                },
+                                {
+                                    tag: 'companion_server_auth_key_pub',
+                                    attrs: {},
+                                    content: authState.creds.noiseKey.public
+                                },
+                                {
+                                    tag: 'companion_platform_id',
+                                    attrs: {},
+                                    content: (0, Utils_1.getPlatformId)(browser[1])
+                                },
+                                {
+                                    tag: 'companion_platform_display',
+                                    attrs: {},
+                                    content: `${browser[1]} (${browser[0]})`
+                                },
+                                {
+                                    tag: 'link_code_pairing_nonce',
+                                    attrs: {},
+                                    content: '0'
+                                }
+                            ]
                         }
                     ]
+                });
+                break;
+            }
+            catch (error) {
+                const statusCode = ((_b = (_a = error === null || error === void 0 ? void 0 : error.output) === null || _a === void 0 ? void 0 : _a.payload) === null || _b === void 0 ? void 0 : _b.statusCode) || (error === null || error === void 0 ? void 0 : error.statusCode);
+                const canRetry = statusCode === 428 || statusCode === Types_1.DisconnectReason.connectionClosed || statusCode === Types_1.DisconnectReason.connectionLost;
+                if (!canRetry || attempt >= maxRetries) {
+                    throw error;
                 }
-            ]
-        });
+                logger.warn({ attempt, statusCode, trace: error === null || error === void 0 ? void 0 : error.stack }, 'pairing code request failed, retrying');
+                await (0, Utils_1.delay)(500 * attempt);
+            }
+        }
         return authState.creds.pairingCode;
     };
     async function generatePairingKey() {

package/package.json

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