zapo-js 0.1.2 → 0.3.0

package/dist/esm/message/content.js

@@ -1,20 +1,212 @@
+import { proto } from '../proto.js';
+import { WA_EDIT_ATTRS, WA_ENC_MEDIA_TYPES, WA_EVENT_META_TYPES, WA_POLL_META_TYPES, WA_STANZA_MSG_TYPES } from '../protocol/constants.js';
 export function isSendMediaMessage(content) {
-    return (!!content &&
-        typeof content === 'object' &&
-        'type' in content &&
-        'media' in content &&
-        'mimetype' in content);
+    return !!content && typeof content === 'object' && 'type' in content && 'media' in content;
+}
+export function unwrapMessage(message) {
+    let msg = message;
+    for (;;) {
+        const inner = msg.ephemeralMessage?.message ??
+            msg.groupMentionedMessage?.message ??
+            msg.botInvokeMessage?.message ??
+            msg.deviceSentMessage?.message ??
+            msg.viewOnceMessage?.message ??
+            msg.viewOnceMessageV2?.message ??
+            msg.documentWithCaptionMessage?.message;
+        if (!inner)
+            return msg;
+        msg = inner;
+    }
 }
 export function resolveMessageTypeAttr(message) {
-    if (message.reactionMessage) {
-        return 'reaction';
+    const msg = unwrapMessage(message);
+    if (msg.reactionMessage || msg.encReactionMessage) {
+        return WA_STANZA_MSG_TYPES.REACTION;
+    }
+    if (msg.eventMessage ||
+        msg.encEventResponseMessage ||
+        msg.secretEncryptedMessage?.secretEncType ===
+            proto.Message.SecretEncryptedMessage.SecretEncType.EVENT_EDIT) {
+        return WA_STANZA_MSG_TYPES.EVENT;
+    }
+    if (msg.pollCreationMessage ||
+        msg.pollCreationMessageV2 ||
+        msg.pollCreationMessageV3 ||
+        msg.pollCreationMessageV5 ||
+        msg.pollUpdateMessage ||
+        msg.secretEncryptedMessage?.secretEncType ===
+            proto.Message.SecretEncryptedMessage.SecretEncType.POLL_EDIT ||
+        msg.secretEncryptedMessage?.secretEncType ===
+            proto.Message.SecretEncryptedMessage.SecretEncType.POLL_ADD_OPTION) {
+        return WA_STANZA_MSG_TYPES.POLL;
+    }
+    if (msg.extendedTextMessage?.matchedText && msg.extendedTextMessage.matchedText.trim() !== '') {
+        return WA_STANZA_MSG_TYPES.MEDIA;
+    }
+    if ((msg.conversation !== undefined && msg.conversation !== null) ||
+        (msg.extendedTextMessage && !msg.extendedTextMessage.matchedText) ||
+        msg.protocolMessage ||
+        msg.interactiveMessage ||
+        msg.keepInChatMessage ||
+        msg.requestPhoneNumberMessage ||
+        msg.editedMessage ||
+        msg.pinInChatMessage ||
+        msg.encCommentMessage ||
+        msg.newsletterAdminInviteMessage ||
+        msg.pollResultSnapshotMessage ||
+        msg.pollResultSnapshotMessageV3 ||
+        msg.templateButtonReplyMessage ||
+        msg.messageHistoryNotice ||
+        msg.secretEncryptedMessage?.secretEncType ===
+            proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT ||
+        msg.secretEncryptedMessage?.secretEncType ===
+            proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_SCHEDULE) {
+        return WA_STANZA_MSG_TYPES.TEXT;
+    }
+    return WA_STANZA_MSG_TYPES.MEDIA;
+}
+const REVOKED_REACTION_TEXT = '';
+export function needsSecretPersistence(message) {
+    const msg = unwrapMessage(message);
+    return !!(msg.pollCreationMessage ||
+        msg.pollCreationMessageV2 ||
+        msg.pollCreationMessageV3 ||
+        msg.pollCreationMessageV4 ||
+        msg.pollCreationMessageV5 ||
+        msg.pollCreationMessageV6 ||
+        msg.eventMessage);
+}
+export function resolveEditAttr(message, subtype) {
+    const msg = unwrapMessage(message);
+    if (msg.protocolMessage) {
+        const protocolType = msg.protocolMessage.type;
+        if (protocolType === proto.Message.ProtocolMessage.Type.REVOKE) {
+            return subtype === 'admin_revoke'
+                ? WA_EDIT_ATTRS.ADMIN_REVOKE
+                : WA_EDIT_ATTRS.SENDER_REVOKE;
+        }
+        if (protocolType === proto.Message.ProtocolMessage.Type.MESSAGE_EDIT) {
+            return WA_EDIT_ATTRS.MESSAGE_EDIT;
+        }
+        return null;
+    }
+    if (msg.secretEncryptedMessage) {
+        const encType = msg.secretEncryptedMessage.secretEncType;
+        if (encType === proto.Message.SecretEncryptedMessage.SecretEncType.EVENT_EDIT ||
+            encType === proto.Message.SecretEncryptedMessage.SecretEncType.MESSAGE_EDIT) {
+            return WA_EDIT_ATTRS.MESSAGE_EDIT;
+        }
+    }
+    if (msg.editedMessage) {
+        return WA_EDIT_ATTRS.MESSAGE_EDIT;
+    }
+    if (msg.reactionMessage) {
+        if (msg.reactionMessage.text === REVOKED_REACTION_TEXT) {
+            return WA_EDIT_ATTRS.SENDER_REVOKE;
+        }
+        return null;
+    }
+    if (msg.keepInChatMessage) {
+        if (msg.keepInChatMessage.key?.fromMe === true &&
+            msg.keepInChatMessage.keepType === proto.KeepType.UNDO_KEEP_FOR_ALL) {
+            return WA_EDIT_ATTRS.SENDER_REVOKE;
+        }
+        return null;
+    }
+    if (msg.pinInChatMessage) {
+        return WA_EDIT_ATTRS.PIN_IN_CHAT;
+    }
+    return null;
+}
+export function resolveEncMediaType(message) {
+    const msg = unwrapMessage(message);
+    if (msg.imageMessage)
+        return WA_ENC_MEDIA_TYPES.IMAGE;
+    if (msg.stickerMessage)
+        return WA_ENC_MEDIA_TYPES.STICKER;
+    if (msg.locationMessage) {
+        return msg.locationMessage.isLive
+            ? WA_ENC_MEDIA_TYPES.LIVE_LOCATION
+            : WA_ENC_MEDIA_TYPES.LOCATION;
+    }
+    if (msg.contactMessage)
+        return WA_ENC_MEDIA_TYPES.VCARD;
+    if (msg.contactsArrayMessage)
+        return WA_ENC_MEDIA_TYPES.CONTACT_ARRAY;
+    if (msg.documentMessage)
+        return WA_ENC_MEDIA_TYPES.DOCUMENT;
+    if (msg.audioMessage) {
+        return msg.audioMessage.ptt ? WA_ENC_MEDIA_TYPES.PTT : WA_ENC_MEDIA_TYPES.AUDIO;
+    }
+    if (msg.videoMessage) {
+        return msg.videoMessage.gifPlayback ? WA_ENC_MEDIA_TYPES.GIF : WA_ENC_MEDIA_TYPES.VIDEO;
+    }
+    if (msg.ptvMessage)
+        return WA_ENC_MEDIA_TYPES.PTV;
+    if (msg.buttonsMessage)
+        return WA_ENC_MEDIA_TYPES.BUTTON;
+    if (msg.buttonsResponseMessage)
+        return WA_ENC_MEDIA_TYPES.BUTTON_RESPONSE;
+    if (msg.listMessage)
+        return WA_ENC_MEDIA_TYPES.LIST;
+    if (msg.listResponseMessage)
+        return WA_ENC_MEDIA_TYPES.LIST_RESPONSE;
+    if (msg.orderMessage)
+        return WA_ENC_MEDIA_TYPES.ORDER;
+    if (msg.productMessage)
+        return WA_ENC_MEDIA_TYPES.PRODUCT;
+    if (msg.groupInviteMessage)
+        return WA_ENC_MEDIA_TYPES.URL;
+    if (msg.interactiveResponseMessage)
+        return WA_ENC_MEDIA_TYPES.NATIVE_FLOW_RESPONSE;
+    if (msg.messageHistoryBundle)
+        return WA_ENC_MEDIA_TYPES.GROUP_HISTORY;
+    if (msg.extendedTextMessage?.matchedText && msg.extendedTextMessage.matchedText.trim() !== '') {
+        return WA_ENC_MEDIA_TYPES.URL;
+    }
+    return null;
+}
+export function resolveMetaAttrs(message) {
+    const msg = unwrapMessage(message);
+    let polltype;
+    let eventType;
+    let viewOnce;
+    if (msg.pollCreationMessage || msg.pollCreationMessageV2 || msg.pollCreationMessageV3) {
+        polltype = WA_POLL_META_TYPES.CREATION;
+    }
+    else if (msg.pollUpdateMessage) {
+        polltype = WA_POLL_META_TYPES.VOTE;
+    }
+    else if (msg.secretEncryptedMessage?.secretEncType ===
+        proto.Message.SecretEncryptedMessage.SecretEncType.POLL_EDIT) {
+        polltype = WA_POLL_META_TYPES.EDIT;
+    }
+    else if (msg.secretEncryptedMessage?.secretEncType ===
+        proto.Message.SecretEncryptedMessage.SecretEncType.POLL_ADD_OPTION) {
+        polltype = WA_POLL_META_TYPES.EDIT;
+    }
+    if (msg.eventMessage) {
+        eventType = WA_EVENT_META_TYPES.CREATION;
+    }
+    else if (msg.encEventResponseMessage) {
+        eventType = WA_EVENT_META_TYPES.RESPONSE;
+    }
+    else if (msg.secretEncryptedMessage?.secretEncType ===
+        proto.Message.SecretEncryptedMessage.SecretEncType.EVENT_EDIT) {
+        eventType = WA_EVENT_META_TYPES.EDIT;
+    }
+    if (message.viewOnceMessage || message.viewOnceMessageV2) {
+        viewOnce = 'true';
     }
-    if (message.imageMessage ||
-        message.videoMessage ||
-        message.audioMessage ||
-        message.documentMessage ||
-        message.stickerMessage) {
-        return 'media';
+    if (!polltype && !eventType && !viewOnce) {
+        return null;
     }
-    return 'text';
+    const attrs = {};
+    if (polltype)
+        attrs.polltype = polltype;
+    if (eventType)
+        attrs.event_type = eventType;
+    if (viewOnce)
+        attrs.view_once = viewOnce;
+    return attrs;
 }

package/dist/esm/message/icdc.js

@@ -0,0 +1,76 @@
+import { sha256, toRawPubKey } from '../crypto/index.js';
+import { parseSignalAddressFromJid } from '../protocol/jid.js';
+import { concatBytes } from '../util/bytes.js';
+const ICDC_DEFAULT_HASH_LENGTH = 8;
+const ICDC_FRESHNESS_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000;
+const DEVICE_LIST_METADATA_VERSION = 2;
+export async function computeDeviceKeyHash(identityKeys, hashLength) {
+    const length = hashLength ?? ICDC_DEFAULT_HASH_LENGTH;
+    if (identityKeys.length === 0) {
+        return new Uint8Array(length);
+    }
+    const rawKeys = new Array(identityKeys.length);
+    for (let i = 0; i < identityKeys.length; i += 1) {
+        rawKeys[i] =
+            identityKeys[i].byteLength === 33 ? toRawPubKey(identityKeys[i]) : identityKeys[i];
+    }
+    const combined = concatBytes(rawKeys);
+    const hash = await sha256(combined);
+    return hash.subarray(0, length);
+}
+export async function resolveIcdcMeta(deviceJids, identityStore, updatedAtMs, localIdentity, hashLength) {
+    if (deviceJids.length === 0) {
+        return null;
+    }
+    const addresses = new Array(deviceJids.length);
+    for (let i = 0; i < deviceJids.length; i += 1) {
+        addresses[i] = parseSignalAddressFromJid(deviceJids[i]);
+    }
+    const remoteKeys = await identityStore.getRemoteIdentities(addresses);
+    const keys = [];
+    for (let i = 0; i < addresses.length; i += 1) {
+        const key = remoteKeys[i];
+        if (key) {
+            keys.push(key);
+        }
+        else if (localIdentity &&
+            addresses[i].user === localIdentity.address.user &&
+            addresses[i].device === localIdentity.address.device) {
+            keys.push(localIdentity.pubKey);
+        }
+    }
+    if (keys.length === 0) {
+        return null;
+    }
+    const keyHash = await computeDeviceKeyHash(keys, hashLength);
+    const timestamp = updatedAtMs !== undefined && Date.now() - updatedAtMs < ICDC_FRESHNESS_THRESHOLD_MS
+        ? Math.floor(updatedAtMs / 1000)
+        : undefined;
+    return { keyHash, timestamp };
+}
+export function injectDeviceListMetadata(message, senderIcdc, recipientIcdc) {
+    if (!senderIcdc && !recipientIcdc) {
+        return message;
+    }
+    const deviceListMetadata = {};
+    if (senderIcdc) {
+        deviceListMetadata.senderKeyHash = senderIcdc.keyHash;
+        if (senderIcdc.timestamp !== undefined) {
+            deviceListMetadata.senderTimestamp = senderIcdc.timestamp;
+        }
+    }
+    if (recipientIcdc) {
+        deviceListMetadata.recipientKeyHash = recipientIcdc.keyHash;
+        if (recipientIcdc.timestamp !== undefined) {
+            deviceListMetadata.recipientTimestamp = recipientIcdc.timestamp;
+        }
+    }
+    return {
+        ...message,
+        messageContextInfo: {
+            ...message.messageContextInfo,
+            deviceListMetadata,
+            deviceListMetadataVersion: DEVICE_LIST_METADATA_VERSION
+        }
+    };
+}

package/dist/esm/message/incoming.js

@@ -3,12 +3,9 @@ import { unpadPkcs7 } from './padding.js';
 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 { buildAckNode, buildReceiptNode } from '../transport/node/builders/global.js';
 import { decodeNodeContentBase64OrBytes, findNodeChild } from '../transport/node/helpers.js';
 import { parseOptionalInt, toError } from '../util/primitives.js';
-function parseMessageTimestamp(value) {
-    return parseOptionalInt(value);
-}
 function pickNextRetryCount(node) {
     const retryNode = findNodeChild(node, 'retry');
     const parsed = parseOptionalInt(retryNode?.attrs.count);
@@ -51,14 +48,6 @@ function buildIncomingEventRawNode(node) {
         content: children
     };
 }
-function buildBaseIncomingEvent(node) {
-    return {
-        rawNode: buildIncomingEventRawNode(node),
-        stanzaId: node.attrs.id,
-        chatJid: node.attrs.from,
-        stanzaType: node.attrs.type
-    };
-}
 function pickSenderKeyDistributionPayload(message) {
     const direct = pickDirectSenderKeyDistributionPayload(message);
     if (direct) {
@@ -125,7 +114,13 @@ async function sendRetryReceiptForDecryptFailure(node, options, error, encType)
     if (options.onDecryptFailure) {
         return options.onDecryptFailure(retryContext, error);
     }
-    const retryReceiptNode = buildInboundRetryReceiptNode(node, stanzaId, from, options.getMeJid?.(), pickNextRetryCount(node));
+    const retryReceiptNode = buildReceiptNode({
+        kind: 'retry',
+        node,
+        id: stanzaId,
+        to: from,
+        retryCount: pickNextRetryCount(node)
+    });
     try {
         await options.sendNode(retryReceiptNode);
         options.logger.debug('sent retry receipt for undecryptable incoming message', {
@@ -152,7 +147,8 @@ async function decryptAndProcessEncNode(node, encNode, encType, senderJid, optio
         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));
+        const decodedMessage = proto.Message.decode(unpaddedPlaintext);
+        const message = unwrapDeviceSentMessage(decodedMessage) ?? decodedMessage;
         const senderKeyDistribution = pickSenderKeyDistributionPayload(message);
         if (senderKeyDistribution && options.senderKeyManager) {
             try {
@@ -177,8 +173,11 @@ async function decryptAndProcessEncNode(node, encNode, encType, senderJid, optio
         if (shouldEmitIncomingMessage(message)) {
             const chatJid = node.attrs.from;
             options.emitIncomingMessage?.({
-                ...buildBaseIncomingEvent(node),
-                timestampSeconds: parseMessageTimestamp(node.attrs.t),
+                rawNode: buildIncomingEventRawNode(node),
+                stanzaId: node.attrs.id,
+                chatJid,
+                stanzaType: node.attrs.type,
+                timestampSeconds: parseOptionalInt(node.attrs.t),
                 senderJid,
                 encryptionType: encType,
                 isGroupChat: chatJid ? isGroupJid(chatJid) : false,
@@ -198,7 +197,10 @@ async function decryptAndProcessEncNode(node, encNode, encType, senderJid, optio
             message: toError(error).message
         });
         options.emitUnhandledStanza?.({
-            ...buildBaseIncomingEvent(node),
+            rawNode: buildIncomingEventRawNode(node),
+            stanzaId: node.attrs.id,
+            chatJid: node.attrs.from,
+            stanzaType: node.attrs.type,
             reason: `message.decrypt_failed.${encType}`
         });
         return { success: false, encType, error };
@@ -229,7 +231,10 @@ export async function handleIncomingMessageAck(node, options) {
                 case 'skmsg': {
                     if (!senderJid || !node.attrs.from || !options.senderKeyManager) {
                         options.emitUnhandledStanza?.({
-                            ...buildBaseIncomingEvent(node),
+                            rawNode: buildIncomingEventRawNode(node),
+                            stanzaId: node.attrs.id,
+                            chatJid: node.attrs.from,
+                            stanzaType: node.attrs.type,
                             reason: 'message.skmsg.missing_group_context'
                         });
                         continue;
@@ -271,7 +276,8 @@ export async function handleIncomingMessageAck(node, options) {
             });
         }
         if (encCount > 0 && !hasSuccessfulDecrypt && firstDecryptFailure) {
-            shouldSendStandardReceipt = !(await sendRetryReceiptForDecryptFailure(node, options, firstDecryptFailure.error, firstDecryptFailure.encType));
+            await sendRetryReceiptForDecryptFailure(node, options, firstDecryptFailure.error, firstDecryptFailure.encType);
+            shouldSendStandardReceipt = false;
         }
     }
     const id = node.attrs.id;
@@ -285,7 +291,13 @@ export async function handleIncomingMessageAck(node, options) {
         return true;
     }
     if (node.attrs.type === WA_MESSAGE_TYPES.MEDIA_NOTIFY) {
-        const ackNode = buildInboundMessageAckNode(node, id, from, options.getMeJid?.());
+        const ackNode = buildAckNode({
+            kind: 'message',
+            node,
+            id,
+            to: from,
+            from: options.getMeJid?.()
+        });
         options.logger.debug('sending inbound message ack', {
             id,
             to: from,
@@ -298,7 +310,12 @@ export async function handleIncomingMessageAck(node, options) {
     if (!shouldSendStandardReceipt) {
         return true;
     }
-    const receiptNode = buildInboundDeliveryReceiptNode(node, id, from);
+    const receiptNode = buildReceiptNode({
+        kind: 'delivery',
+        node,
+        id,
+        to: from
+    });
     options.logger.debug('sending inbound message receipt', {
         id,
         to: from,
@@ -308,6 +325,3 @@ export async function handleIncomingMessageAck(node, options) {
     await options.sendNode(receiptNode);
     return true;
 }
-function normalizeIncomingDecryptedMessage(message) {
-    return unwrapDeviceSentMessage(message) ?? message;
-}

package/dist/esm/message/phash.js

@@ -1,25 +1,47 @@
 import { sha256 } from '../crypto/core/index.js';
-import { splitJid } from '../protocol/jid.js';
 import { bytesToBase64, TEXT_ENCODER } from '../util/bytes.js';
 export async function computePhashV2(participants) {
     if (participants.length === 0) {
         return '2:';
     }
-    const canonical = participants.map((participant) => toPhashCanonicalWid(participant));
+    const canonical = new Array(participants.length);
+    for (let i = 0; i < participants.length; i += 1)
+        canonical[i] = toPhashCanonicalWid(participants[i]);
     const joined = canonical.sort().join('');
     const digest = await sha256(TEXT_ENCODER.encode(joined));
     return `2:${bytesToBase64(digest.subarray(0, 6))}`;
 }
 function toPhashCanonicalWid(jid) {
-    const { user, server } = splitJid(jid);
-    const normalizedServer = server === 'c.us' ? 's.whatsapp.net' : server;
-    const colonIndex = user.indexOf(':');
-    const userWithOptionalAgent = colonIndex >= 0 ? user.slice(0, colonIndex) : user;
-    const baseUser = userWithOptionalAgent.endsWith('.0')
-        ? userWithOptionalAgent.slice(0, userWithOptionalAgent.length - 2)
-        : userWithOptionalAgent;
-    const deviceRaw = colonIndex >= 0 ? user.slice(colonIndex + 1) : '0';
-    const device = Number.parseInt(deviceRaw, 10);
-    const normalizedDevice = Number.isSafeInteger(device) && device >= 0 ? device : 0;
-    return `${baseUser}.0:${normalizedDevice}@${normalizedServer}`;
+    const atIndex = jid.indexOf('@');
+    if (atIndex < 1 || atIndex >= jid.length - 1)
+        return jid;
+    const colonIndex = jid.indexOf(':', 0);
+    const userEnd = colonIndex >= 0 && colonIndex < atIndex ? colonIndex : atIndex;
+    const hasZeroAgent = userEnd >= 2 && jid.charCodeAt(userEnd - 2) === 46 && jid.charCodeAt(userEnd - 1) === 48;
+    const baseUserEnd = hasZeroAgent ? userEnd - 2 : userEnd;
+    const baseUser = jid.slice(0, baseUserEnd);
+    let device = 0;
+    if (colonIndex >= 0 && colonIndex < atIndex) {
+        for (let i = colonIndex + 1; i < atIndex; i += 1) {
+            const digit = jid.charCodeAt(i) - 48;
+            if (digit < 0 || digit > 9) {
+                device = 0;
+                break;
+            }
+            device = device * 10 + digit;
+            if (device > Number.MAX_SAFE_INTEGER) {
+                device = 0;
+                break;
+            }
+        }
+    }
+    const serverStart = atIndex + 1;
+    const serverLen = jid.length - serverStart;
+    const isCUs = serverLen === 4 &&
+        jid.charCodeAt(serverStart) === 99 &&
+        jid.charCodeAt(serverStart + 1) === 46 &&
+        jid.charCodeAt(serverStart + 2) === 117 &&
+        jid.charCodeAt(serverStart + 3) === 115;
+    const normalizedServer = isCUs ? 's.whatsapp.net' : jid.slice(serverStart);
+    return `${baseUser}.0:${device}@${normalizedServer}`;
 }

package/dist/esm/message/reporting-token.js

@@ -1,6 +1,6 @@
 import { hkdf, hmacSign, importHmacKey } from '../crypto/index.js';
 import { proto } from '../proto.js';
-import { base64ToBytesChecked, concatBytes, EMPTY_BYTES, TEXT_ENCODER, toBytesView } from '../util/bytes.js';
+import { base64ToBytesChecked, concatBytes, EMPTY_BYTES, TEXT_ENCODER } from '../util/bytes.js';
 const WA_REPORTING_TOKEN_BYTES = 16;
 const WA_REPORTING_TOKEN_KEY_BYTES = 32;
 const WA_REPORTING_TOKEN_USE_CASE = 'Report Token';
@@ -9,30 +9,21 @@ const WA_REPORTING_TOKEN_CONFIG_BYTES = base64ToBytesChecked(WA_REPORTING_TOKEN_
 export const WA_REPORTING_TOKEN_VERSION = 2;
 let reportingTokenConfigSpec = null;
 const reportingTokenConfigCache = new Map();
-export async function buildReportingTokenNode(input) {
-    const artifacts = await buildReportingTokenArtifacts(input);
-    return artifacts?.node ?? null;
-}
 export async function buildReportingTokenArtifacts(input) {
     const stanzaId = input.stanzaId.trim();
     if (!stanzaId || !isMessageReportingTokenCompatible(input.message)) {
         return null;
     }
     const messageSecret = input.message.messageContextInfo?.messageSecret;
-    if (!messageSecret || toBytesView(messageSecret).byteLength === 0) {
+    if (!messageSecret || messageSecret.byteLength === 0) {
         return null;
     }
     const reportingTokenContent = computeReportingTokenContent(proto.Message.encode(input.message).finish(), input.version ?? WA_REPORTING_TOKEN_VERSION);
     if (reportingTokenContent.byteLength === 0) {
         return null;
     }
-    const secretInfo = concatBytes([
-        TEXT_ENCODER.encode(stanzaId),
-        TEXT_ENCODER.encode(input.senderUserJid),
-        TEXT_ENCODER.encode(input.remoteJid),
-        TEXT_ENCODER.encode(WA_REPORTING_TOKEN_USE_CASE)
-    ]);
-    const reportingTokenKey = await hkdf(toBytesView(messageSecret), null, secretInfo, WA_REPORTING_TOKEN_KEY_BYTES);
+    const secretInfo = TEXT_ENCODER.encode(stanzaId + input.senderUserJid + input.remoteJid + WA_REPORTING_TOKEN_USE_CASE);
+    const reportingTokenKey = await hkdf(messageSecret, null, secretInfo, WA_REPORTING_TOKEN_KEY_BYTES);
     const hmacKey = await importHmacKey(reportingTokenKey);
     const reportingToken = (await hmacSign(hmacKey, reportingTokenContent)).subarray(0, WA_REPORTING_TOKEN_BYTES);
     const version = input.version ?? WA_REPORTING_TOKEN_VERSION;
@@ -68,13 +59,11 @@ function computeReportingTokenContent(messageBytes, version) {
     if (extracted.totalSize === 0) {
         return EMPTY_BYTES;
     }
-    const output = new Uint8Array(extracted.totalSize);
-    let offset = 0;
-    for (const part of extracted.parts) {
-        output.set(part.bytes, offset);
-        offset += part.bytes.length;
+    const parts = new Array(extracted.parts.length);
+    for (let index = 0; index < extracted.parts.length; index += 1) {
+        parts[index] = extracted.parts[index].bytes;
     }
-    return output;
+    return concatBytes(parts);
 }
 function getReportingTokenConfig(version) {
     const cached = reportingTokenConfigCache.get(version);
@@ -251,7 +240,8 @@ function extractProtobufFieldParts(bytes, start, end, config, rootConfig) {
         if (!configuredField) {
             continue;
         }
-        if (!configuredField.isMessage && isExtractWholeField(configuredField)) {
+        if (!configuredField.isMessage &&
+            (!configuredField.subfields || configuredField.subfields.fields.size === 0)) {
             const fieldBytes = bytes.subarray(parsedField.start, parsedField.next);
             parts.push({
                 fieldNumber: parsedField.fieldNumber,
@@ -293,9 +283,6 @@ function extractProtobufFieldParts(bytes, start, end, config, rootConfig) {
         totalSize
     };
 }
-function isExtractWholeField(field) {
-    return !field.subfields || field.subfields.fields.size === 0;
-}
 function parseProtobufField(bytes, start, end) {
     const tag = readVarint(bytes, start, end);
     const tagValue = tag.value;
@@ -424,15 +411,15 @@ function encodeVarint(value) {
     if (!Number.isSafeInteger(value) || value < 0) {
         throw new Error(`invalid varint value: ${value}`);
     }
-    if (value === 0) {
-        return new Uint8Array([0]);
-    }
-    const bytes = [];
+    const bytes = new Uint8Array(10);
+    let length = 0;
     let current = value;
     while (current >= 128) {
-        bytes.push((current % 128) + 128);
+        bytes[length] = (current % 128) + 128;
+        length += 1;
         current = Math.floor(current / 128);
     }
-    bytes.push(current);
-    return new Uint8Array(bytes);
+    bytes[length] = current;
+    length += 1;
+    return bytes.subarray(0, length);
 }

package/dist/esm/message/use-case-secret.js

@@ -19,7 +19,7 @@ export function assertMessageSecret(messageSecret, context = 'message secret') {
 }
 export async function ensureMessageSecret(message) {
     const messageSecret = message.messageContextInfo?.messageSecret;
-    if (messageSecret && toBytesView(messageSecret).byteLength > 0) {
+    if (messageSecret && messageSecret.byteLength > 0) {
         return message;
     }
     const generatedMessageSecret = await randomBytesAsync(WA_MESSAGE_SECRET_BYTES);