zapo-js 0.1.0 → 0.1.2

package/dist/esm/message/incoming.js

@@ -4,32 +4,15 @@ import { proto } from '../proto.js';
 import { WA_MESSAGE_TAGS, WA_MESSAGE_TYPES } from '../protocol/constants.js';
 import { isBroadcastJid, isGroupJid, parseSignalAddressFromJid } from '../protocol/jid.js';
 import { buildInboundDeliveryReceiptNode, buildInboundMessageAckNode, buildInboundRetryReceiptNode } from '../transport/node/builders/message.js';
-import { decodeNodeContentBase64OrBytes, findNodeChild, getNodeChildrenByTag } from '../transport/node/helpers.js';
-import { toError } from '../util/primitives.js';
-function pickMessageSenderJid(node) {
-    return node.attrs.participant ?? node.attrs.from;
-}
-function pickMessageChatJid(node) {
-    return node.attrs.from;
-}
+import { decodeNodeContentBase64OrBytes, findNodeChild } from '../transport/node/helpers.js';
+import { parseOptionalInt, toError } from '../util/primitives.js';
 function parseMessageTimestamp(value) {
-    if (!value) {
-        return undefined;
-    }
-    const parsed = Number.parseInt(value, 10);
-    if (!Number.isSafeInteger(parsed)) {
-        return undefined;
-    }
-    return parsed;
+    return parseOptionalInt(value);
 }
 function pickNextRetryCount(node) {
     const retryNode = findNodeChild(node, 'retry');
-    const countRaw = retryNode?.attrs.count;
-    if (!countRaw) {
-        return 1;
-    }
-    const parsed = Number.parseInt(countRaw, 10);
-    if (!Number.isSafeInteger(parsed) || parsed < 1) {
+    const parsed = parseOptionalInt(retryNode?.attrs.count);
+    if (!parsed || parsed < 1) {
         return 1;
     }
     return parsed + 1;
@@ -39,21 +22,26 @@ function buildIncomingEventRawNode(node) {
     if (!Array.isArray(nodeContent) || nodeContent.length === 0) {
         return node;
     }
-    let redacted = false;
-    const children = nodeContent.map((child) => {
-        if (child.tag !== WA_MESSAGE_TAGS.ENC) {
-            return child;
+    let children = null;
+    for (let index = 0; index < nodeContent.length; index += 1) {
+        const child = nodeContent[index];
+        const shouldRedact = child.tag === WA_MESSAGE_TAGS.ENC &&
+            (typeof child.content === 'string' || child.content instanceof Uint8Array);
+        if (!shouldRedact) {
+            if (children) {
+                children.push(child);
+            }
+            continue;
         }
-        if (typeof child.content === 'string' || child.content instanceof Uint8Array) {
-            redacted = true;
-            return {
-                tag: child.tag,
-                attrs: child.attrs
-            };
+        if (!children) {
+            children = nodeContent.slice(0, index);
         }
-        return child;
-    });
-    if (!redacted) {
+        children.push({
+            tag: child.tag,
+            attrs: child.attrs
+        });
+    }
+    if (!children) {
         return node;
     }
     // Strip heavy encrypted payload from event snapshots to reduce retention.
@@ -105,46 +93,21 @@ function shouldEmitIncomingMessage(message) {
     if (!pickDirectSenderKeyDistributionPayload(message)) {
         return true;
     }
-    for (const [field, value] of Object.entries(message)) {
-        if (value === null || value === undefined) {
-            continue;
-        }
+    const messageRecord = message;
+    for (const field in messageRecord) {
         if (field === 'senderKeyDistributionMessage' ||
             field === 'fastRatchetKeySenderKeyDistributionMessage' ||
             field === '$$unknownFieldCount') {
             continue;
         }
+        const value = messageRecord[field];
+        if (value === null || value === undefined) {
+            continue;
+        }
         return true;
     }
     return false;
 }
-async function maybeProcessSenderKeyDistributionMessage(senderJid, message, options, node) {
-    if (!senderJid || !options.senderKeyManager) {
-        return;
-    }
-    const senderKeyDistribution = pickSenderKeyDistributionPayload(message);
-    if (!senderKeyDistribution) {
-        return;
-    }
-    try {
-        await options.senderKeyManager.processSenderKeyDistributionPayload(senderKeyDistribution.groupId, parseSignalAddressFromJid(senderJid), senderKeyDistribution.payload);
-        options.logger.debug('processed incoming sender key distribution', {
-            id: node.attrs.id,
-            from: node.attrs.from,
-            participant: node.attrs.participant,
-            groupId: senderKeyDistribution.groupId
-        });
-    }
-    catch (error) {
-        options.logger.warn('failed to process incoming sender key distribution', {
-            id: node.attrs.id,
-            from: node.attrs.from,
-            participant: node.attrs.participant,
-            groupId: senderKeyDistribution.groupId,
-            message: toError(error).message
-        });
-    }
-}
 async function sendRetryReceiptForDecryptFailure(node, options, error, encType) {
     const stanzaId = node.attrs.id;
     const from = node.attrs.from;
@@ -186,12 +149,33 @@ async function sendRetryReceiptForDecryptFailure(node, options, error, encType)
 }
 async function decryptAndProcessEncNode(node, encNode, encType, senderJid, options, decrypt) {
     try {
-        const decryptedPayload = await decrypt(decodeNodeContentBase64OrBytes(encNode.content, 'message.enc'));
+        const senderAddress = parseSignalAddressFromJid(senderJid);
+        const decryptedPayload = await decrypt(decodeNodeContentBase64OrBytes(encNode.content, 'message.enc'), senderAddress);
         const unpaddedPlaintext = unpadPkcs7(decryptedPayload);
         const message = normalizeIncomingDecryptedMessage(proto.Message.decode(unpaddedPlaintext));
-        await maybeProcessSenderKeyDistributionMessage(senderJid, message, options, node);
+        const senderKeyDistribution = pickSenderKeyDistributionPayload(message);
+        if (senderKeyDistribution && options.senderKeyManager) {
+            try {
+                await options.senderKeyManager.processSenderKeyDistributionPayload(senderKeyDistribution.groupId, senderAddress, senderKeyDistribution.payload);
+                options.logger.debug('processed incoming sender key distribution', {
+                    id: node.attrs.id,
+                    from: node.attrs.from,
+                    participant: node.attrs.participant,
+                    groupId: senderKeyDistribution.groupId
+                });
+            }
+            catch (error) {
+                options.logger.warn('failed to process incoming sender key distribution', {
+                    id: node.attrs.id,
+                    from: node.attrs.from,
+                    participant: node.attrs.participant,
+                    groupId: senderKeyDistribution.groupId,
+                    message: toError(error).message
+                });
+            }
+        }
         if (shouldEmitIncomingMessage(message)) {
-            const chatJid = pickMessageChatJid(node);
+            const chatJid = node.attrs.from;
             options.emitIncomingMessage?.({
                 ...buildBaseIncomingEvent(node),
                 timestampSeconds: parseMessageTimestamp(node.attrs.t),
@@ -225,57 +209,68 @@ export async function handleIncomingMessageAck(node, options) {
         return false;
     }
     let shouldSendStandardReceipt = true;
-    const encNodes = getNodeChildrenByTag(node, WA_MESSAGE_TAGS.ENC);
-    if (encNodes.length > 1 && encNodes[0]?.attrs.type === 'skmsg') {
-        options.logger.warn('incoming message enc order is unexpected: skmsg first', {
-            id: node.attrs.id,
-            from: node.attrs.from,
-            participant: node.attrs.participant,
-            encCount: encNodes.length
-        });
-    }
-    if (encNodes.length > 0) {
-        const senderJid = pickMessageSenderJid(node);
-        const chatJid = pickMessageChatJid(node);
+    const nodeContent = node.content;
+    if (Array.isArray(nodeContent) && nodeContent.length > 0) {
+        const senderJid = node.attrs.participant ?? node.attrs.from;
         let hasSuccessfulDecrypt = false;
         let firstDecryptFailure = null;
-        for (const encNode of encNodes) {
-            const encType = encNode.attrs.type;
-            if (!encType) {
+        let encCount = 0;
+        let firstEncType;
+        for (const child of nodeContent) {
+            if (child.tag !== WA_MESSAGE_TAGS.ENC) {
                 continue;
             }
-            if (encType === 'skmsg') {
-                if (!senderJid || !chatJid || !options.senderKeyManager) {
-                    options.emitUnhandledStanza?.({
-                        ...buildBaseIncomingEvent(node),
-                        reason: 'message.skmsg.missing_group_context'
-                    });
-                    continue;
-                }
-                const result = await decryptAndProcessEncNode(node, encNode, encType, senderJid, options, (ciphertext) => options.senderKeyManager.decryptGroupMessage({
-                    groupId: chatJid,
-                    sender: parseSignalAddressFromJid(senderJid),
-                    ciphertext
-                }));
-                if (result.success) {
-                    hasSuccessfulDecrypt = true;
-                }
-                else if (!firstDecryptFailure) {
-                    firstDecryptFailure = result;
-                }
-                continue;
+            encCount += 1;
+            if (firstEncType === undefined) {
+                firstEncType = child.attrs.type;
             }
-            if ((encType === 'msg' || encType === 'pkmsg') && senderJid && options.signalProtocol) {
-                const result = await decryptAndProcessEncNode(node, encNode, encType, senderJid, options, (ciphertext) => options.signalProtocol.decryptMessage(parseSignalAddressFromJid(senderJid), { type: encType, ciphertext }));
-                if (result.success) {
-                    hasSuccessfulDecrypt = true;
+            let result = null;
+            switch (child.attrs.type) {
+                case 'skmsg': {
+                    if (!senderJid || !node.attrs.from || !options.senderKeyManager) {
+                        options.emitUnhandledStanza?.({
+                            ...buildBaseIncomingEvent(node),
+                            reason: 'message.skmsg.missing_group_context'
+                        });
+                        continue;
+                    }
+                    const groupId = node.attrs.from;
+                    result = await decryptAndProcessEncNode(node, child, 'skmsg', senderJid, options, (ciphertext, senderAddress) => options.senderKeyManager.decryptGroupMessage({
+                        groupId,
+                        sender: senderAddress,
+                        ciphertext
+                    }));
+                    break;
                 }
-                else if (!firstDecryptFailure) {
-                    firstDecryptFailure = result;
+                case 'msg':
+                case 'pkmsg': {
+                    if (!senderJid || !options.signalProtocol) {
+                        continue;
+                    }
+                    const encType = child.attrs.type === 'msg' ? 'msg' : 'pkmsg';
+                    result = await decryptAndProcessEncNode(node, child, encType, senderJid, options, (ciphertext, senderAddress) => options.signalProtocol.decryptMessage(senderAddress, {
+                        type: encType,
+                        ciphertext
+                    }));
+                    break;
                 }
+                default:
+                    continue;
             }
+            if (result.success)
+                hasSuccessfulDecrypt = true;
+            else if (!firstDecryptFailure)
+                firstDecryptFailure = result;
+        }
+        if (encCount > 1 && firstEncType === 'skmsg') {
+            options.logger.warn('incoming message enc order is unexpected: skmsg first', {
+                id: node.attrs.id,
+                from: node.attrs.from,
+                participant: node.attrs.participant,
+                encCount
+            });
         }
-        if (!hasSuccessfulDecrypt && firstDecryptFailure) {
+        if (encCount > 0 && !hasSuccessfulDecrypt && firstDecryptFailure) {
             shouldSendStandardReceipt = !(await sendRetryReceiptForDecryptFailure(node, options, firstDecryptFailure.error, firstDecryptFailure.encType));
         }
     }

package/dist/esm/message/index.js

@@ -1,2 +1,4 @@
 export { WaMessageClient } from './WaMessageClient.js';
+export * from './addon-crypto.js';
 export * from './types.js';
+export * from './use-case-secret.js';