zapo-js 1.1.0 → 1.1.1

package/README.md

@@ -1,5 +1,9 @@
 <p align="center">
-  <img src="https://raw.githubusercontent.com/vinikjkkj/zapo/master/.github/assets/logo.png" alt="zapo" width="400" />
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/vinikjkkj/zapo/master/.github/assets/logo.png" />
+    <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/vinikjkkj/zapo/master/.github/assets/logo-light.png" />
+    <img src="https://raw.githubusercontent.com/vinikjkkj/zapo/master/.github/assets/logo-light.png" alt="zapo" width="400" />
+  </picture>
 </p>
 
 <p align="center">

package/dist/auth/pairing/WaPairingFlow.js

@@ -11,6 +11,7 @@ const WaAdvSignature_1 = require("../../signal/attestation/WaAdvSignature");
 const global_1 = require("../../transport/node/builders/global");
 const pairing_1 = require("../../transport/node/builders/pairing");
 const helpers_1 = require("../../transport/node/helpers");
+const query_1 = require("../../transport/node/query");
 const bytes_1 = require("../../util/bytes");
 class WaPairingFlow {
     constructor(options) {
@@ -49,6 +50,7 @@ class WaPairingFlow {
             responseTag: response.tag,
             responseType: response.attrs.type
         });
+        (0, query_1.assertIqResult)(response, 'companion hello');
         const linkCodeNode = (0, helpers_1.findNodeChild)(response, constants_1.WA_NODE_TAGS.LINK_CODE_COMPANION_REG);
         if (!linkCodeNode) {
             throw new Error('companion hello response missing link_code_companion_reg');

package/dist/client/WaClient.js

@@ -258,10 +258,28 @@ class WaClient extends node_events_1.EventEmitter {
                 return;
             }
             if (protocolType === _proto_1.proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION) {
-                if (this.options.history?.enabled !== false &&
-                    protocolMessage.historySyncNotification) {
-                    const peerRemoteJid = event.key.remoteJid;
-                    const peerStanzaId = event.key.id;
+                if (!protocolMessage.historySyncNotification) {
+                    return;
+                }
+                const peerRemoteJid = event.key.remoteJid;
+                const peerStanzaId = event.key.id;
+                const sendHistSyncReceipt = peerRemoteJid && peerStanzaId
+                    ? async () => {
+                        try {
+                            await this.message.sendReceipt(peerRemoteJid, peerStanzaId, {
+                                type: constants_1.WA_MESSAGE_TYPES.RECEIPT_TYPE_HISTORY_SYNC
+                            });
+                        }
+                        catch (err) {
+                            this.logger.warn('failed to send hist_sync receipt', {
+                                id: peerStanzaId,
+                                to: peerRemoteJid,
+                                message: (0, primitives_1.toError)(err).message
+                            });
+                        }
+                    }
+                    : undefined;
+                if (this.options.history?.enabled !== false) {
                     await (0, history_sync_1.runHistorySyncNotification)({
                         logger: this.logger,
                         mediaTransfer: this.mediaTransfer,
@@ -269,24 +287,12 @@ class WaClient extends node_events_1.EventEmitter {
                         emitEvent: this.emit.bind(this),
                         onPrivacyTokens: (conversations) => this.deps.trustedContactToken.hydrateFromHistorySync(conversations),
                         onNctSalt: (salt) => this.deps.trustedContactToken.hydrateNctSaltFromHistorySync(salt),
-                        onProcessed: peerRemoteJid && peerStanzaId
-                            ? async () => {
-                                try {
-                                    await this.message.sendReceipt(peerRemoteJid, peerStanzaId, {
-                                        type: constants_1.WA_MESSAGE_TYPES.RECEIPT_TYPE_HISTORY_SYNC
-                                    });
-                                }
-                                catch (err) {
-                                    this.logger.warn('failed to send hist_sync receipt', {
-                                        id: peerStanzaId,
-                                        to: peerRemoteJid,
-                                        message: (0, primitives_1.toError)(err).message
-                                    });
-                                }
-                            }
-                            : undefined
+                        onProcessed: sendHistSyncReceipt
                     }, protocolMessage.historySyncNotification);
                 }
+                else if (sendHistSyncReceipt) {
+                    await sendHistSyncReceipt();
+                }
                 return;
             }
             if (SYNC_RELATED_PROTOCOL_TYPES.has(protocolType)) {

package/dist/client/coordinators/WaIncomingNodeCoordinator.js

@@ -391,7 +391,7 @@ class WaIncomingNodeCoordinator {
                 try {
                     const routingInfo = (0, helpers_1.decodeNodeContentBase64OrBytes)(routingInfoNode.content, `ib.${constants_1.WA_NODE_TAGS.EDGE_ROUTING}.${constants_1.WA_NODE_TAGS.ROUTING_INFO}`);
                     await this.runtime.persistRoutingInfo(routingInfo);
-                    this.logger.info('updated routing info from info bulletin', {
+                    this.logger.debug('updated routing info from info bulletin', {
                         byteLength: routingInfo.byteLength
                     });
                 }

package/dist/client/coordinators/WaRetryCoordinator.d.ts

@@ -50,7 +50,6 @@ export declare class WaRetryCoordinator {
     private isRetryReceiptNode;
     private prepareDecryptFailureRetry;
     private sendDecryptFailureRetryReceipt;
-    private resolvePeerRetryRecipient;
     private handleParsedRetryRequest;
     private processRetryRequest;
     private prepareRetryResend;

package/dist/client/coordinators/WaRetryCoordinator.js

@@ -169,7 +169,7 @@ class WaRetryCoordinator {
         };
     }
     async sendDecryptFailureRetryReceipt(context, prepared) {
-        const recipient = context.recipient ?? this.resolvePeerRetryRecipient(context);
+        const { recipient } = context;
         const retryReceiptNode = (0, retry_1.buildRetryReceiptNode)({
             stanzaId: context.stanzaId,
             to: context.from,
@@ -194,26 +194,6 @@ class WaRetryCoordinator {
             withKeys: prepared.retryKeys !== undefined
         });
     }
-    resolvePeerRetryRecipient(context) {
-        if (!context.participant) {
-            return undefined;
-        }
-        const meLid = this.deps.getCurrentCredentials()?.meLid;
-        if (!meLid) {
-            return undefined;
-        }
-        try {
-            const participantUser = (0, jid_1.toUserJid)(context.participant);
-            const meUserLid = (0, jid_1.toUserJid)(meLid);
-            if (participantUser !== meUserLid) {
-                return undefined;
-            }
-            return meUserLid;
-        }
-        catch {
-            return undefined;
-        }
-    }
     async handleParsedRetryRequest(receiptNode, request) {
         if (request.type === constants_1.WA_MESSAGE_TYPES.RECEIPT_TYPE_ENC_REKEY_RETRY) {
             this.deps.logger.debug('received enc_rekey_retry request (voip path deferred)', {

package/dist/client/messaging/ignore-key.js

@@ -88,12 +88,14 @@ function extractIgnoreKeyContext(node, meJid) {
     const me = tryParseJid(meJid);
     const fromCandidates = collectFromCandidates(kind, a);
     const fromMe = me !== null && fromCandidates.some((f) => tryParseJid(f)?.address.user === me.address.user);
+    // Device-stripped to match the JID form used by events/keys; a userless
+    // server `from` like `s.whatsapp.net` is unparseable, so fall back to raw.
     return {
         kind,
-        remoteJid: a.from ?? null,
+        remoteJid: tryParseJid(a.from)?.userJid ?? a.from ?? null,
         fromMe,
         id: a.id,
-        participant: a.participant ?? null
+        participant: tryParseJid(a.participant)?.userJid ?? a.participant ?? null
     };
 }
 /** Pure matcher. Exported for direct testing without a coordinator. */

package/dist/client/types.d.ts

@@ -423,27 +423,30 @@ export interface WaIgnoreKey {
  * Lib derives `kind` from the stanza tag and resolves `fromMe` by comparing
  * every from-candidate (`from`, `sender_pn`, `sender_lid`) against `meJid`.
  *
- * `remoteJid` and `participant` expose the **raw** `from` / `participant`
- * attrs verbatim and do NOT include the descriptor-style alt-attr lookups
- * (`sender_pn` / `sender_lid` / `participant_pn` / `participant_lid`) or
- * PN↔LID normalization. If the predicate needs to match by user identity
- * regardless of addressing mode, run the raw JID through `parseJidFull` and
- * compare on `userJid`, or use the descriptor form which handles it.
+ * `remoteJid` and `participant` are the `from` / `participant` attrs with the
+ * `:device` segment stripped (bare `user@server`), matching the JID form used
+ * by message events and keys. A value that does not parse as a JID (e.g. a
+ * userless server `from` like `s.whatsapp.net`) is passed through unchanged.
+ * They do NOT include the descriptor-style
+ * alt-attr lookups (`sender_pn` / `sender_lid` / `participant_pn` /
+ * `participant_lid`) or PN↔LID normalization, so they stay in whichever
+ * addressing mode the stanza arrived in. To match by user identity regardless
+ * of addressing mode, use the descriptor form, which handles it.
  */
 export interface WaIgnoreKeyContext {
     readonly kind: WaIgnoreStanzaKind;
-    /** Raw `from` attr (group JID for groups, PN or LID device JID for 1:1). */
+    /** `from` attr without `:device` (group JID for groups, PN or LID user JID for 1:1). */
     readonly remoteJid: string | null;
     readonly fromMe: boolean;
     readonly id: string | undefined;
-    /** Raw `participant` attr; `null` for non-group stanzas. */
+    /** `participant` attr without `:device`; `null` for non-group stanzas. */
     readonly participant: string | null;
 }
 /**
  * Predicate form of {@link WaClient.ignoreKey}. Return `true` to drop the
  * stanza, `false` to let it through. Receives a {@link WaIgnoreKeyContext}
- * with the raw `from`/`participant` attrs (see the context's JSDoc for the
- * PN↔LID caveat) plus lib-resolved `kind` and `fromMe`.
+ * with the device-stripped `from`/`participant` (see the context's JSDoc for
+ * the addressing-mode caveat) plus lib-resolved `kind` and `fromMe`.
  */
 export type WaIgnoreKeyPredicate = (ctx: WaIgnoreKeyContext) => boolean;
 export interface WaIncomingBaseEvent {

package/dist/esm/auth/pairing/WaPairingFlow.js

@@ -8,6 +8,7 @@ import { ADV_PREFIX_HOSTED_ACCOUNT_SIGNATURE, computeAdvIdentityHmac, generateDe
 import { buildAckNode, buildIqResultNode } from '../../transport/node/builders/global.js';
 import { buildCompanionFinishRequestNode, buildCompanionHelloRequestNode, buildGetCountryCodeRequestNode } from '../../transport/node/builders/pairing.js';
 import { decodeNodeContentUtf8OrBytes, findNodeChild, findNodeChildrenByTags, getFirstNodeChild, getNodeChildrenNonEmptyUtf8ByTag, hasNodeChild } from '../../transport/node/helpers.js';
+import { assertIqResult } from '../../transport/node/query.js';
 import { concatBytes, decodeProtoBytes, uint8Equal, uint8TimingSafeEqual } from '../../util/bytes.js';
 export class WaPairingFlow {
     constructor(options) {
@@ -46,6 +47,7 @@ export class WaPairingFlow {
             responseTag: response.tag,
             responseType: response.attrs.type
         });
+        assertIqResult(response, 'companion hello');
         const linkCodeNode = findNodeChild(response, WA_NODE_TAGS.LINK_CODE_COMPANION_REG);
         if (!linkCodeNode) {
             throw new Error('companion hello response missing link_code_companion_reg');

package/dist/esm/client/WaClient.js

@@ -255,10 +255,28 @@ export class WaClient extends EventEmitter {
                 return;
             }
             if (protocolType === proto.Message.ProtocolMessage.Type.HISTORY_SYNC_NOTIFICATION) {
-                if (this.options.history?.enabled !== false &&
-                    protocolMessage.historySyncNotification) {
-                    const peerRemoteJid = event.key.remoteJid;
-                    const peerStanzaId = event.key.id;
+                if (!protocolMessage.historySyncNotification) {
+                    return;
+                }
+                const peerRemoteJid = event.key.remoteJid;
+                const peerStanzaId = event.key.id;
+                const sendHistSyncReceipt = peerRemoteJid && peerStanzaId
+                    ? async () => {
+                        try {
+                            await this.message.sendReceipt(peerRemoteJid, peerStanzaId, {
+                                type: WA_MESSAGE_TYPES.RECEIPT_TYPE_HISTORY_SYNC
+                            });
+                        }
+                        catch (err) {
+                            this.logger.warn('failed to send hist_sync receipt', {
+                                id: peerStanzaId,
+                                to: peerRemoteJid,
+                                message: toError(err).message
+                            });
+                        }
+                    }
+                    : undefined;
+                if (this.options.history?.enabled !== false) {
                     await runHistorySyncNotification({
                         logger: this.logger,
                         mediaTransfer: this.mediaTransfer,
@@ -266,24 +284,12 @@ export class WaClient extends EventEmitter {
                         emitEvent: this.emit.bind(this),
                         onPrivacyTokens: (conversations) => this.deps.trustedContactToken.hydrateFromHistorySync(conversations),
                         onNctSalt: (salt) => this.deps.trustedContactToken.hydrateNctSaltFromHistorySync(salt),
-                        onProcessed: peerRemoteJid && peerStanzaId
-                            ? async () => {
-                                try {
-                                    await this.message.sendReceipt(peerRemoteJid, peerStanzaId, {
-                                        type: WA_MESSAGE_TYPES.RECEIPT_TYPE_HISTORY_SYNC
-                                    });
-                                }
-                                catch (err) {
-                                    this.logger.warn('failed to send hist_sync receipt', {
-                                        id: peerStanzaId,
-                                        to: peerRemoteJid,
-                                        message: toError(err).message
-                                    });
-                                }
-                            }
-                            : undefined
+                        onProcessed: sendHistSyncReceipt
                     }, protocolMessage.historySyncNotification);
                 }
+                else if (sendHistSyncReceipt) {
+                    await sendHistSyncReceipt();
+                }
                 return;
             }
             if (SYNC_RELATED_PROTOCOL_TYPES.has(protocolType)) {

package/dist/esm/client/coordinators/WaIncomingNodeCoordinator.js

@@ -388,7 +388,7 @@ export class WaIncomingNodeCoordinator {
                 try {
                     const routingInfo = decodeNodeContentBase64OrBytes(routingInfoNode.content, `ib.${WA_NODE_TAGS.EDGE_ROUTING}.${WA_NODE_TAGS.ROUTING_INFO}`);
                     await this.runtime.persistRoutingInfo(routingInfo);
-                    this.logger.info('updated routing info from info bulletin', {
+                    this.logger.debug('updated routing info from info bulletin', {
                         byteLength: routingInfo.byteLength
                     });
                 }

package/dist/esm/client/coordinators/WaRetryCoordinator.js

@@ -166,7 +166,7 @@ export class WaRetryCoordinator {
         };
     }
     async sendDecryptFailureRetryReceipt(context, prepared) {
-        const recipient = context.recipient ?? this.resolvePeerRetryRecipient(context);
+        const { recipient } = context;
         const retryReceiptNode = buildRetryReceiptNode({
             stanzaId: context.stanzaId,
             to: context.from,
@@ -191,26 +191,6 @@ export class WaRetryCoordinator {
             withKeys: prepared.retryKeys !== undefined
         });
     }
-    resolvePeerRetryRecipient(context) {
-        if (!context.participant) {
-            return undefined;
-        }
-        const meLid = this.deps.getCurrentCredentials()?.meLid;
-        if (!meLid) {
-            return undefined;
-        }
-        try {
-            const participantUser = toUserJid(context.participant);
-            const meUserLid = toUserJid(meLid);
-            if (participantUser !== meUserLid) {
-                return undefined;
-            }
-            return meUserLid;
-        }
-        catch {
-            return undefined;
-        }
-    }
     async handleParsedRetryRequest(receiptNode, request) {
         if (request.type === WA_MESSAGE_TYPES.RECEIPT_TYPE_ENC_REKEY_RETRY) {
             this.deps.logger.debug('received enc_rekey_retry request (voip path deferred)', {

package/dist/esm/client/messaging/ignore-key.js

@@ -82,12 +82,14 @@ export function extractIgnoreKeyContext(node, meJid) {
     const me = tryParseJid(meJid);
     const fromCandidates = collectFromCandidates(kind, a);
     const fromMe = me !== null && fromCandidates.some((f) => tryParseJid(f)?.address.user === me.address.user);
+    // Device-stripped to match the JID form used by events/keys; a userless
+    // server `from` like `s.whatsapp.net` is unparseable, so fall back to raw.
     return {
         kind,
-        remoteJid: a.from ?? null,
+        remoteJid: tryParseJid(a.from)?.userJid ?? a.from ?? null,
         fromMe,
         id: a.id,
-        participant: a.participant ?? null
+        participant: tryParseJid(a.participant)?.userJid ?? a.participant ?? null
     };
 }
 /** Pure matcher. Exported for direct testing without a coordinator. */

package/dist/esm/message/primitives/incoming.js

@@ -229,7 +229,7 @@ function processMsmsgEncNode(node, encNode, senderJid, options) {
                 encPayload: decoded.encPayload
             }
         };
-        const chatJid = node.attrs.from;
+        const chatJid = node.attrs.from ? toUserJid(node.attrs.from) : node.attrs.from;
         const sender = senderJid ? parseJidFull(senderJid) : null;
         const isGroup = chatJid ? isGroupJid(chatJid) : false;
         const isBroadcast = chatJid ? isBroadcastJid(chatJid) : false;
@@ -302,7 +302,11 @@ async function decryptAndProcessEncNode(node, encNode, encType, senderJid, optio
             }
         }
         if (shouldEmitIncomingMessage(message)) {
-            const chatJid = node.attrs.from;
+            // remoteJid is the chat identity, which is deviceless: the device
+            // lives in senderDevice (from senderAddress), so strip any `:device`
+            // segment the `from` attr carries for 1:1 chats.
+            const fromAttr = node.attrs.from;
+            const chatJid = fromAttr ? toUserJid(fromAttr) : fromAttr;
             const isGroup = chatJid ? isGroupJid(chatJid) : false;
             const isBroadcast = chatJid ? isBroadcastJid(chatJid) : false;
             const senderUserJid = `${senderAddress.user}@${senderAddress.server}`;

package/dist/esm/transport/WaComms.js

@@ -169,6 +169,10 @@ export class WaComms {
         await this.socket.close(1000, 'stop_comms');
     }
     async closeSocketAndResume() {
+        if (!this.started || this.preventRetry) {
+            this.logger.debug('comms resume skipped: comms stopped or retry disabled');
+            return;
+        }
         this.logger.debug('comms close socket and resume requested');
         this.resetConnectionState({
             started: true,

package/dist/esm/transport/keepalive/WaKeepAlive.js

@@ -101,6 +101,10 @@ export class WaKeepAlive {
             }
         }
         catch (error) {
+            if (generation !== this.generation) {
+                this.logger.trace('keepalive stopped during in-flight ping, not resuming');
+                return;
+            }
             this.logger.warn('keepalive ping failed, reconnecting socket', {
                 message: toError(error).message
             });

package/dist/message/primitives/incoming.js

@@ -233,7 +233,7 @@ function processMsmsgEncNode(node, encNode, senderJid, options) {
                 encPayload: decoded.encPayload
             }
         };
-        const chatJid = node.attrs.from;
+        const chatJid = node.attrs.from ? (0, jid_1.toUserJid)(node.attrs.from) : node.attrs.from;
         const sender = senderJid ? (0, jid_1.parseJidFull)(senderJid) : null;
         const isGroup = chatJid ? (0, jid_1.isGroupJid)(chatJid) : false;
         const isBroadcast = chatJid ? (0, jid_1.isBroadcastJid)(chatJid) : false;
@@ -306,7 +306,11 @@ async function decryptAndProcessEncNode(node, encNode, encType, senderJid, optio
             }
         }
         if (shouldEmitIncomingMessage(message)) {
-            const chatJid = node.attrs.from;
+            // remoteJid is the chat identity, which is deviceless: the device
+            // lives in senderDevice (from senderAddress), so strip any `:device`
+            // segment the `from` attr carries for 1:1 chats.
+            const fromAttr = node.attrs.from;
+            const chatJid = fromAttr ? (0, jid_1.toUserJid)(fromAttr) : fromAttr;
             const isGroup = chatJid ? (0, jid_1.isGroupJid)(chatJid) : false;
             const isBroadcast = chatJid ? (0, jid_1.isBroadcastJid)(chatJid) : false;
             const senderUserJid = `${senderAddress.user}@${senderAddress.server}`;

package/dist/transport/WaComms.js

@@ -172,6 +172,10 @@ class WaComms {
         await this.socket.close(1000, 'stop_comms');
     }
     async closeSocketAndResume() {
+        if (!this.started || this.preventRetry) {
+            this.logger.debug('comms resume skipped: comms stopped or retry disabled');
+            return;
+        }
         this.logger.debug('comms close socket and resume requested');
         this.resetConnectionState({
             started: true,

package/dist/transport/keepalive/WaKeepAlive.js

@@ -104,6 +104,10 @@ class WaKeepAlive {
             }
         }
         catch (error) {
+            if (generation !== this.generation) {
+                this.logger.trace('keepalive stopped during in-flight ping, not resuming');
+                return;
+            }
             this.logger.warn('keepalive ping failed, reconnecting socket', {
                 message: (0, primitives_1.toError)(error).message
             });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zapo-js",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "High-performance WhatsApp Web TypeScript library",
     "license": "MIT",
     "author": "vinikjkkj <contact@vinicius.email> (https://github.com/vinikjkkj)",