@aunucore/baileys 1.0.76 → 1.0.77

package/lib/Socket/messages-send.js

@@ -334,12 +334,23 @@ export const makeMessagesSocket = (config) => {
             // the transport to reopen, bounded by connectTimeoutMs; a connection
             // that closes for good still fails fast via waitForSocketOpen itself.
             const waitMs = config.connectTimeoutMs ?? 60000;
-            await Promise.race([
-                waitForSocketOpen(),
-                delay(waitMs).then(() => {
-                    throw new Boom(`Timed out waiting ${waitMs}ms for the connection to open before sending`, { statusCode: 408 }); // 408 = DisconnectReason.timedOut
-                })
-            ]);
+            const openWait = waitForSocketOpen();
+            try {
+                await Promise.race([
+                    openWait,
+                    delay(waitMs).then(() => {
+                        throw new Boom(`Timed out waiting ${waitMs}ms for the connection to open before sending`, { statusCode: 408 }); // 408 = DisconnectReason.timedOut
+                    })
+                ]);
+            }
+            catch (err) {
+                // AunuBaileys (1.0.77, HB-167): when the timeout wins,
+                // the socket-open waiter is still pending — detach its
+                // ws listeners now instead of leaving three behind per
+                // failed send until the socket settles on its own.
+                openWait.cancel?.();
+                throw err;
+            }
         }
         // AunuBaileys (1.0.68): fail with a clear Boom instead of a raw
         // TypeError when sending before pairing completes or with a

package/lib/Socket/socket.js

@@ -92,6 +92,15 @@ export const makeSocket = (config) => {
     let epoch = 1;
     let keepAliveReq;
     let qrTimer;
+    // AunuBaileys (1.0.77, HB-243): true while a pair-device QR chain
+    // is cycling — a duplicate pair-device IQ must not start a second
+    // chain on the shared qrTimer slot.
+    let qrChainActive = false;
+    // AunuBaileys (1.0.77, HB-213): resolved when the Noise handshake
+    // completes (finishInit in validateConnection), so the pairing
+    // request can wait for an encrypted channel.
+    let resolveHandshakeComplete;
+    const handshakeComplete = new Promise((resolve) => { resolveHandshakeComplete = resolve; });
     let closed = false;
     let lastDisconnectError;
     const uqTagId = generateMdTagPrefix();
@@ -226,6 +235,7 @@ export const makeSocket = (config) => {
             }
         }).finish());
         noise.finishInit();
+        resolveHandshakeComplete?.();
         startKeepAliveRequest();
     };
     const getAvailablePreKeysOnServer = async () => {
@@ -278,12 +288,17 @@ export const makeSocket = (config) => {
             await uploadPreKeys();
         }
     };
+    // AunuBaileys (1.0.77, HB-156): decodeFrame invocations must never
+    // overlap — the noise handler slices ONE shared inBytes buffer, so
+    // two concurrent calls interleave and deliver stanzas out of wire
+    // order. Every WS message is chained through a single queue.
+    let frameDecodeChain = Promise.resolve();
     const onMessageReceived = (data) => {
         // AunuBaileys (1.0.67): decodeFrame is async — a malformed frame
         // (bad GCM tag, truncated binary node) or a throwing frame
         // listener must not become an unhandled rejection that kills
         // the process; route failures to onUnexpectedError instead.
-        Promise.resolve(noise.decodeFrame(data, frame => {
+        frameDecodeChain = frameDecodeChain.then(() => noise.decodeFrame(data, frame => {
             // reset ping timeout
             lastDateRecv = new Date();
             let anyTriggered = false;
@@ -311,7 +326,20 @@ export const makeSocket = (config) => {
                     logger.debug({ unhandled: true, msgId, fromMe: false, frame }, 'communication recv');
                 }
             }
-        })).catch(err => onUnexpectedError(err, 'onMessageReceived'));
+        })).catch(err => {
+            // AunuBaileys (1.0.77, HB-185/HB-207): a frame-layer failure
+            // (oversize header, GCM decrypt failure) leaves the noise
+            // stream unrecoverable — the header is never consumed, or
+            // the read counter desyncs so every later frame fails too.
+            // End the connection so the host reconnects at once instead
+            // of wedging until the keep-alive watchdog notices (~65s).
+            if (err?.isFrameFatal) {
+                end(err);
+            }
+            else {
+                onUnexpectedError(err, 'onMessageReceived');
+            }
+        });
     };
     // AunuBaileys: socket end handlers (pola v7) + fetch Mex (dari @itsliaaa/baileys)
     const socketEndHandlers = [];
@@ -329,6 +357,7 @@ export const makeSocket = (config) => {
         logger.info({ trace: error?.stack }, error ? 'connection errored' : 'connection closed');
         clearInterval(keepAliveReq);
         clearTimeout(qrTimer);
+        qrChainActive = false;
         ws.removeAllListeners('close');
         ws.removeAllListeners('open');
         ws.removeAllListeners('message');
@@ -354,16 +383,20 @@ export const makeSocket = (config) => {
         ev.removeAllListeners('connection.update');
         ev.destroy?.();
     };
-    const waitForSocketOpen = async () => {
+    const waitForSocketOpen = () => {
         if (ws.isOpen) {
-            return;
+            const resolved = Promise.resolve();
+            resolved.cancel = () => { };
+            return resolved;
         }
         if (ws.isClosed || ws.isClosing) {
-            throw new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed });
+            const rejected = Promise.reject(new Boom('Connection Closed', { statusCode: DisconnectReason.connectionClosed }));
+            rejected.cancel = () => { };
+            return rejected;
         }
         let onOpen;
         let onClose;
-        await new Promise((resolve, reject) => {
+        const promise = new Promise((resolve, reject) => {
             onOpen = () => resolve(undefined);
             onClose = mapWebSocketError(reject);
             ws.on('open', onOpen);
@@ -374,6 +407,16 @@ export const makeSocket = (config) => {
             ws.off('close', onClose);
             ws.off('error', onClose);
         });
+        // AunuBaileys (1.0.77, HB-167/HB-179): a caller that stops
+        // waiting (its own timeout won the race) can detach these
+        // listeners immediately instead of leaving them on the ws
+        // emitter until the socket happens to open/close/error.
+        promise.cancel = () => {
+            ws.off('open', onOpen);
+            ws.off('close', onClose);
+            ws.off('error', onClose);
+        };
+        return promise;
     };
     const keepAliveTick = () => {
         if (!lastDateRecv) {
@@ -501,15 +544,55 @@ export const makeSocket = (config) => {
                 reject(new Boom(`requestPairingCode: socket did not open within ${PAIRING_READY_TIMEOUT_MS / 1000}s (last disconnect: ${describeLastDisconnect()})`, { statusCode: DisconnectReason.timedOut }));
             }, PAIRING_READY_TIMEOUT_MS);
         });
+        const rawOpenWait = waitForSocketOpen();
         try {
             await Promise.race([
-                waitForSocketOpen().catch(() => {
+                rawOpenWait.catch(() => {
                     throw new Boom(`requestPairingCode: connection closed while waiting for the socket to open (last disconnect: ${describeLastDisconnect()})`, { statusCode: DisconnectReason.connectionClosed });
                 }),
                 closedWhileWaiting,
                 timedOut
             ]);
         }
+        finally {
+            clearTimeout(timer);
+            // AunuBaileys (1.0.77, HB-179): if the timeout or the close
+            // guard won the race, the socket-open waiter is still
+            // pending — detach its ws listeners now instead of leaving
+            // them behind until the socket settles on its own.
+            rawOpenWait.cancel?.();
+            if (onUpdate) {
+                try {
+                    ev.off('connection.update', onUpdate);
+                }
+                catch { }
+            }
+        }
+    };
+    // AunuBaileys (1.0.77, HB-213): the pairing IQ must not leave
+    // before the Noise handshake completes — encodeFrame encrypts
+    // only once the handshake is finished, so an early IQ travels as
+    // a plaintext binary node; a strict server kills the connection
+    // over it while requestPairingCode still resolves with the code.
+    const waitForHandshakeComplete = async () => {
+        let onUpdate;
+        const closedWhileWaiting = new Promise((_, reject) => {
+            onUpdate = (update) => {
+                if (update.connection === 'close') {
+                    reject(new Boom(`requestPairingCode: connection closed while waiting for the handshake to complete (last disconnect: ${describeLastDisconnect()})`, { statusCode: DisconnectReason.connectionClosed }));
+                }
+            };
+            ev.on('connection.update', onUpdate);
+        });
+        let timer;
+        const timedOut = new Promise((_, reject) => {
+            timer = setTimeout(() => {
+                reject(new Boom(`requestPairingCode: handshake did not complete within ${PAIRING_READY_TIMEOUT_MS / 1000}s (last disconnect: ${describeLastDisconnect()})`, { statusCode: DisconnectReason.timedOut }));
+            }, PAIRING_READY_TIMEOUT_MS);
+        });
+        try {
+            await Promise.race([handshakeComplete, closedWhileWaiting, timedOut]);
+        }
         finally {
             clearTimeout(timer);
             if (onUpdate) {
@@ -534,13 +617,20 @@ export const makeSocket = (config) => {
         pairingCodeRequestInFlight = true;
         try {
         await waitForPairingReady();
+        await waitForHandshakeComplete();
         authState.creds.pairingCode = pairingCode;
         authState.creds.me = {
             id: jidEncode(phoneNumber, 's.whatsapp.net'),
             name: '~'
         };
         ev.emit('creds.update', authState.creds);
-        await sendNode({
+        // AunuBaileys (1.0.77, HB-191): query(), not sendNode() — the
+        // companion_hello result must be awaited and error-checked.
+        // sendNode resolved when the bytes hit the wire, so a server
+        // rejection left the optimistic creds.me/pairingCode persisted
+        // and sent the next boot into a 401 loop; a rejection now
+        // lands in the catch below, which rolls the creds back.
+        await query({
             tag: 'iq',
             attrs: {
                 to: S_WHATSAPP_NET,
@@ -644,6 +734,16 @@ export const makeSocket = (config) => {
         }
     });
     ws.on('error', mapWebSocketError(end));
+    // AunuBaileys (1.0.77, HB-189): the ws client forwards
+    // 'unexpected-response', which suppresses ws's own handshake
+    // abort — without a listener here a non-101 response (403/502,
+    // ISP intercept page) wedges the socket in 'connecting' forever:
+    // no open, no error, no close, and the host never reconnects.
+    ws.on('unexpected-response', (_req, res) => {
+        const code = res?.statusCode;
+        const statusCode = Number.isFinite(code) && code >= 400 && code <= 599 ? code : 500;
+        end(new Boom(`Unexpected server response: ${code}`, { statusCode }));
+    });
     ws.on('close', () => end(new Boom('Connection Terminated', { statusCode: DisconnectReason.connectionClosed })));
     // the server terminated the connection
     ws.on('CB:xmlstreamend', () => end(new Boom('Connection Terminated by Server', { statusCode: DisconnectReason.connectionClosed })));
@@ -662,6 +762,16 @@ export const makeSocket = (config) => {
             }
         };
         await sendNode(iq);
+        // AunuBaileys (1.0.77, HB-243): a duplicate pair-device IQ
+        // (server retry) must not start a parallel QR chain — both
+        // chains share the single qrTimer slot, so the orphaned first
+        // chain keeps cycling after login and its ref exhaustion ends
+        // the healthy, freshly logged-in connection.
+        if (qrChainActive) {
+            logger.warn('ignoring duplicate pair-device IQ: a QR chain is already running');
+            return;
+        }
+        qrChainActive = true;
         const pairDeviceNode = getBinaryNodeChild(stanza, 'pair-device');
         const refNodes = getBinaryNodeChildren(pairDeviceNode, 'ref');
         const noiseKeyB64 = Buffer.from(creds.noiseKey.public).toString('base64');
@@ -670,6 +780,7 @@ export const makeSocket = (config) => {
         let qrMs = qrTimeout || 60000; // time to let a QR live
         const genPairQR = () => {
             if (!ws.isOpen) {
+                qrChainActive = false;
                 return;
             }
             const refNode = refNodes.shift();
@@ -726,6 +837,7 @@ export const makeSocket = (config) => {
             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
+            qrChainActive = false;
             ev.emit('creds.update', { me: { ...authState.creds.me, lid: node.attrs.lid } });
             ev.emit('connection.update', { connection: 'open' });
         }
@@ -737,9 +849,9 @@ export const makeSocket = (config) => {
     // AunuBaileys (1.0.71): 405 client_too_old — fetch the live WA Web
     // build so the caller's reconnect uses it (donor: violetix
     // lib/Socket/socket.js CB:failure handler). Only for static versions;
-    // a resolver function re-resolves on the next connect anyway. The
-    // connection.update signal is best-effort: end() may already have
-    // torn the listeners down by the time the fetch lands.
+    // a resolver function re-resolves on the next connect anyway. Both
+    // 405 paths (CB:failure and CB:stream:error) await this before
+    // end(), so the clientTooOld signal reaches the host first.
     const handleClientTooOld = async () => {
         if (typeof config.version === 'function') {
             return;
@@ -759,11 +871,16 @@ export const makeSocket = (config) => {
             logger.warn({ err }, 'failed to fetch the latest WA Web version after a 405');
         }
     };
-    ws.on('CB:stream:error', (node) => {
+    ws.on('CB:stream:error', async (node) => {
         logger.error({ node }, 'stream errored out');
         const { reason, statusCode } = getErrorCodeFromStreamError(node);
         if (statusCode === 405) {
-            void handleClientTooOld();
+            // AunuBaileys (1.0.77, HB-148): awaited like the CB:failure
+            // path (1.0.72) — firing it void let end() tear the
+            // connection.update listeners down before the version
+            // fetch landed, so the clientTooOld signal never reached
+            // the host and a 405 looked like any other disconnect.
+            await handleClientTooOld();
         }
         end(new Boom(`Stream Errored (${reason})`, { statusCode, data: node }));
     });
@@ -802,7 +919,7 @@ export const makeSocket = (config) => {
         if (offlineDrainBatches >= OFFLINE_DRAIN_MAX_BATCHES) {
             stopOfflineDrain();
             logger.warn({ batches: offlineDrainBatches }, 'offline drain hit the batch cap; remaining backlog waits for the next reconnect');
-            return;
+            return false;
         }
         offlineDrainBatches += 1;
         // AunuBaileys (1.0.70): a floating sendNode here could reject
@@ -812,12 +929,19 @@ export const makeSocket = (config) => {
             attrs: {},
             content: [{ tag: 'offline_batch', attrs: { count: '100' } }]
         }).catch(err => logger.warn({ err }, 'failed to request offline batch'));
+        return true;
     };
     const scheduleOfflineDrain = () => {
         stopOfflineDrain();
         offlineDrainTimer = setTimeout(() => {
-            requestOfflineBatch();
-            scheduleOfflineDrain();
+            // AunuBaileys (1.0.77, HB-109): stop re-arming at the batch
+            // cap — the unconditional re-schedule used to undo
+            // requestOfflineBatch's stopOfflineDrain(), so when the
+            // terminal offline bulletin never arrived the cap warning
+            // repeated every 500ms for the life of the socket.
+            if (requestOfflineBatch()) {
+                scheduleOfflineDrain();
+            }
         }, OFFLINE_DRAIN_INTERVAL_MS);
     };
     ws.on('CB:ib,,offline_preview', (node) => {

package/lib/Utils/generics.js

@@ -374,6 +374,16 @@ export const getCallStatusFromNode = ({ tag, attrs }) => {
 };
 const UNEXPECTED_SERVER_CODE_TEXT = 'Unexpected server response: ';
 export const getCodeFromWSError = (error) => {
+    // AunuBaileys (1.0.77, HB-133): an error that already carries a
+    // valid Boom status code keeps it. Re-deriving the code from the
+    // message text lost real codes — promiseTimeout's Boom
+    // 'Timed Out' (408) was re-wrapped as a 500 by mapWebSocketError
+    // because the textual timeout check below is case-sensitive
+    // ('Timed Out' vs 'timed out').
+    const existingCode = error?.output?.statusCode;
+    if (Number.isFinite(existingCode) && existingCode >= 400 && existingCode <= 599) {
+        return existingCode;
+    }
     let statusCode = 500;
     if (error?.message?.includes(UNEXPECTED_SERVER_CODE_TEXT)) {
         const code = +error?.message.slice(UNEXPECTED_SERVER_CODE_TEXT.length);
@@ -385,7 +395,7 @@ export const getCodeFromWSError = (error) => {
     // AunuBaileys (1.0.67): error.code can be numeric (e.g. WS close
     // 1006) — only call startsWith on strings.
     (typeof error?.code === 'string' && error.code.startsWith('E')) ||
-        error?.message?.includes('timed out')) {
+        error?.message?.toLowerCase().includes('timed out')) {
         // handle ETIMEOUT, ENOTFOUND etc
         statusCode = 408;
     }

package/lib/Utils/noise-handler.js

@@ -15,8 +15,8 @@ const generateIV = (counter) => {
 // corrupt header either wedges the stream forever (size 0: the header
 // is never consumed, so every later call re-reads it) or buffers
 // without bound waiting for megabytes that never arrive. Fail loudly
-// instead: the socket ends (the caller routes the throw to
-// onUnexpectedError) and the host reconnects.
+// instead: the throw is marked frame-fatal (1.0.77, HB-185) and the
+// caller ends the socket, so the host reconnects at once.
 const MAX_NOISE_FRAME_SIZE = 10 * 1024 * 1024;
 export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey }, NOISE_HEADER, logger, routingInfo }) => {
     logger = logger.child({ class: 'ns' });
@@ -161,23 +161,55 @@ export const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publi
                 }
                 if (size > MAX_NOISE_FRAME_SIZE) {
                     // AunuBaileys (1.0.73, HB-91): never wait for a
-                    // frame that cannot exist — throw so the socket
-                    // ends instead of buffering without bound until
-                    // the keep-alive watchdog kills the connection
-                    // ~65s later.
-                    throw new Boom(`noise frame too large: ${size} bytes`, { statusCode: 400 });
+                    // frame that cannot exist. (1.0.77, HB-185): the
+                    // throw alone did NOT end the socket — the caller
+                    // only logged it, the header was never consumed,
+                    // and the stream wedged until the keep-alive
+                    // watchdog fired ~65s later. Marked frame-fatal:
+                    // the caller now ends the connection on it.
+                    const err = new Boom(`noise frame too large: ${size} bytes`, { statusCode: 400 });
+                    err.isFrameFatal = true;
+                    throw err;
                 }
                 if (inBytes.length < size + 3) {
                     break;
                 }
                 let frame = inBytes.slice(3, size + 3);
                 inBytes = inBytes.slice(size + 3);
+                let decoded = true;
                 if (isFinished) {
-                    const result = decrypt(frame);
-                    frame = await decodeBinaryNode(result);
+                    let result;
+                    try {
+                        result = decrypt(frame);
+                    }
+                    catch (err) {
+                        // AunuBaileys (1.0.77, HB-207): a GCM failure
+                        // leaves readCounter behind the server's
+                        // counter, so every later frame decrypts with
+                        // the wrong IV and fails too — the stream can
+                        // never resync. Frame-fatal: the caller ends
+                        // the connection instead of losing every
+                        // inbound message until the watchdog fires.
+                        err.isFrameFatal = true;
+                        throw err;
+                    }
+                    try {
+                        frame = await decodeBinaryNode(result);
+                    }
+                    catch (err) {
+                        // AunuBaileys (1.0.77): stanza-level corruption
+                        // is NOT fatal — the frame was consumed and the
+                        // counter advanced, so the stream is still in
+                        // sync. Log and skip the frame instead of
+                        // aborting the rest of the buffered frames.
+                        logger.error({ err }, 'failed to decode a stanza; skipping the frame');
+                        decoded = false;
+                    }
+                }
+                if (decoded) {
+                    logger.trace({ msg: frame?.attrs?.id }, 'recv frame');
+                    onFrame(frame);
                 }
-                logger.trace({ msg: frame?.attrs?.id }, 'recv frame');
-                onFrame(frame);
                 size = getBytesSize();
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aunucore/baileys",
   "type": "module",
-  "version": "1.0.76",
+  "version": "1.0.77",
   "description": "AunuBaileys — the self-healing WhatsApp Web API for Node.js. Bad MAC and \"2000 messages into the future\" errors repair themselves, LID and phone-number identities stay in sync, anti-ban is built in, pairing codes are custom — plus 29 experimental features no other Baileys fork ships: invisible watermarks, per-person tag-all cards, side-profile text, ghost mentions and more. ESM, CJS and full TypeScript types.",
   "keywords": [
     "whatsapp",