zapo-js 0.1.0 → 0.1.2

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

@@ -1,33 +1,30 @@
-import { toSerializedPubKey } from '../../crypto/core/keys.js';
+import { randomBytesAsync, sha256 } from '../../crypto/index.js';
+import { ensureMessageSecret } from '../../message/index.js';
 import { resolveMessageTypeAttr } from '../../message/content.js';
 import { wrapDeviceSentMessage } from '../../message/device-sent.js';
 import { writeRandomPadMax16 } from '../../message/padding.js';
 import { computePhashV2 } from '../../message/phash.js';
+import { buildReportingTokenArtifacts } from '../../message/reporting-token.js';
 import { proto } from '../../proto.js';
 import { WA_DEFAULTS } from '../../protocol/constants.js';
 import { isGroupJid, normalizeDeviceJid, normalizeRecipientJid, parseSignalAddressFromJid, splitJid, toUserJid } from '../../protocol/jid.js';
-import { RETRY_OUTBOUND_TTL_MS } from '../../retry/constants.js';
-import { encodeRetryReplayPayload } from '../../retry/outbound.js';
+import { signalAddressKey } from '../../protocol/jid.js';
 import { encodeBinaryNode } from '../../transport/binary/index.js';
 import { buildDirectMessageFanoutNode, buildGroupDirectMessageNode, buildGroupSenderKeyMessageNode } from '../../transport/node/builders/message.js';
-import { bytesToHex, uint8Equal } from '../../util/bytes.js';
+import { bytesToHex, concatBytes, TEXT_ENCODER } from '../../util/bytes.js';
 import { toError } from '../../util/primitives.js';
-import { signalAddressKey } from '../../util/signal-address.js';
 export class WaMessageDispatchCoordinator {
     constructor(options) {
         this.logger = options.logger;
         this.messageClient = options.messageClient;
-        this.retryStore = options.retryStore;
-        this.participantsStore = options.participantsStore;
-        this.retryTtlMs = this.retryStore.getTtlMs?.() ?? RETRY_OUTBOUND_TTL_MS;
+        this.retryTracker = options.retryTracker;
+        this.sessionResolver = options.sessionResolver;
+        this.fanoutResolver = options.fanoutResolver;
+        this.participantsCache = options.participantsCache;
+        this.appStateSyncKeyProtocol = options.appStateSyncKeyProtocol;
         this.buildMessageContent = options.buildMessageContent;
-        this.queryGroupParticipantJids = options.queryGroupParticipantJids;
         this.senderKeyManager = options.senderKeyManager;
         this.signalProtocol = options.signalProtocol;
-        this.signalStore = options.signalStore;
-        this.signalDeviceSync = options.signalDeviceSync;
-        this.signalIdentitySync = options.signalIdentitySync;
-        this.signalSessionSync = options.signalSessionSync;
         this.getCurrentMeJid = options.getCurrentMeJid;
         this.getCurrentMeLid = options.getCurrentMeLid;
         this.getCurrentSignedIdentity = options.getCurrentSignedIdentity;
@@ -43,13 +40,13 @@ export class WaMessageDispatchCoordinator {
             mode: 'opaque_node',
             node: encodeBinaryNode(node)
         };
-        return this.publishWithRetryTracking({
+        return this.retryTracker.track({
             messageIdHint: node.attrs.id,
             toJid: node.attrs.to,
+            type: messageType,
+            replayPayload,
             participantJid: node.attrs.participant,
-            recipientJid: node.attrs.recipient,
-            messageType,
-            replayPayload
+            recipientJid: node.attrs.recipient
         }, async () => this.messageClient.publishNode(node, options));
     }
     async publishEncryptedMessage(input, options = {}) {
@@ -66,12 +63,12 @@ export class WaMessageDispatchCoordinator {
             ciphertext: input.ciphertext,
             participant: input.participant
         };
-        return this.publishWithRetryTracking({
+        return this.retryTracker.track({
             messageIdHint: input.id,
             toJid: input.to,
-            participantJid: input.participant,
-            messageType: input.type ?? 'text',
-            replayPayload
+            type: input.type ?? 'text',
+            replayPayload,
+            participantJid: input.participant
         }, async () => this.messageClient.publishEncrypted(input, options));
     }
     async publishSignalMessage(input, options = {}) {
@@ -86,7 +83,7 @@ export class WaMessageDispatchCoordinator {
         });
         const [paddedPlaintext] = await Promise.all([
             writeRandomPadMax16(input.plaintext),
-            this.ensureSignalSession(address, input.to, input.expectedIdentity)
+            this.sessionResolver.ensureSession(address, input.to, input.expectedIdentity)
         ]);
         const encrypted = await this.signalProtocol.encryptMessage(address, paddedPlaintext, input.expectedIdentity);
         const messageType = input.type ?? 'text';
@@ -96,12 +93,12 @@ export class WaMessageDispatchCoordinator {
             type: messageType,
             plaintext: paddedPlaintext
         };
-        return this.publishWithRetryTracking({
+        return this.retryTracker.track({
             messageIdHint: input.id,
             toJid: input.to,
-            participantJid: input.participant,
-            messageType,
-            replayPayload
+            type: messageType,
+            replayPayload,
+            participantJid: input.participant
         }, async () => this.messageClient.publishEncrypted({
             to: input.to,
             encType: encrypted.type,
@@ -116,286 +113,40 @@ export class WaMessageDispatchCoordinator {
     }
     async sendMessage(to, content, options = {}) {
         const recipientJid = normalizeRecipientJid(to);
-        const message = await this.buildMessageContent(content);
-        const plaintext = await writeRandomPadMax16(proto.Message.encode(message).finish());
-        const type = resolveMessageTypeAttr(message);
+        const [message, sendOptions] = await Promise.all([
+            this.buildMessageContent(content),
+            this.withResolvedMessageId(options)
+        ]);
+        const messageWithSecret = await ensureMessageSecret(message);
+        const plaintext = await writeRandomPadMax16(proto.Message.encode(messageWithSecret).finish());
+        const type = resolveMessageTypeAttr(messageWithSecret);
         if (isGroupJid(recipientJid)) {
-            if (this.shouldUseGroupDirectPath(message)) {
-                return this.publishGroupDirectMessage(recipientJid, plaintext, type, options);
+            if (this.shouldUseGroupDirectPath(messageWithSecret)) {
+                return this.publishGroupDirectMessage(recipientJid, messageWithSecret, plaintext, type, sendOptions);
             }
-            return this.publishGroupSenderKeyMessage(recipientJid, plaintext, type, options);
+            return this.publishGroupSenderKeyMessage(recipientJid, messageWithSecret, plaintext, type, sendOptions);
         }
         const directRecipientJid = toUserJid(recipientJid);
-        return this.publishDirectSignalMessageWithFanout(directRecipientJid, message, plaintext, type, options);
+        return this.publishDirectSignalMessageWithFanout(directRecipientJid, messageWithSecret, plaintext, type, sendOptions);
     }
     async syncSignalSession(jid, reasonIdentity = false) {
         const address = parseSignalAddressFromJid(jid);
         if (address.server === WA_DEFAULTS.GROUP_SERVER) {
             throw new Error('syncSignalSession supports only direct chats');
         }
-        await this.ensureSignalSession(address, jid, undefined, reasonIdentity);
+        await this.sessionResolver.ensureSession(address, jid, undefined, reasonIdentity);
     }
     async sendReceipt(input) {
         await this.messageClient.sendReceipt(input);
     }
     async requestAppStateSyncKeys(keyIds) {
-        const normalizedKeyIds = this.normalizeKeyIds(keyIds);
-        if (normalizedKeyIds.length === 0) {
-            return [];
-        }
-        const peerDeviceJids = await this.resolveOwnPeerDeviceJids();
-        if (peerDeviceJids.length === 0) {
-            this.logger.warn('app-state sync key request skipped: no peer devices available', {
-                keys: normalizedKeyIds.length
-            });
-            return [];
-        }
-        const protocolMessage = {
-            type: proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_REQUEST,
-            appStateSyncKeyRequest: {
-                keyIds: normalizedKeyIds.map((keyId) => ({
-                    keyId
-                }))
-            }
-        };
-        await Promise.all(peerDeviceJids.map((deviceJid) => this.publishProtocolMessageToDevice(deviceJid, protocolMessage)));
-        this.logger.info('app-state sync key request sent to peer devices', {
-            devices: peerDeviceJids.length,
-            keys: normalizedKeyIds.length,
-            keyIds: normalizedKeyIds.map((keyId) => bytesToHex(keyId)).join(',')
-        });
-        return peerDeviceJids;
+        return this.appStateSyncKeyProtocol.requestKeys(keyIds);
     }
     async sendAppStateSyncKeyShare(toDeviceJid, keys, missingKeyIds = []) {
-        const normalizedTo = normalizeDeviceJid(toDeviceJid);
-        const dedupedKeysById = new Map();
-        for (const key of keys) {
-            dedupedKeysById.set(bytesToHex(key.keyId), key);
-        }
-        const dedupedKeys = [...dedupedKeysById.values()];
-        const dedupedMissingKeyIds = this.normalizeKeyIds(missingKeyIds).filter((keyId) => !dedupedKeysById.has(bytesToHex(keyId)));
-        const keyShareEntries = [
-            ...dedupedKeys.map((key) => ({
-                keyId: { keyId: key.keyId },
-                keyData: {
-                    keyData: key.keyData,
-                    timestamp: key.timestamp,
-                    ...(key.fingerprint ? { fingerprint: key.fingerprint } : {})
-                }
-            })),
-            ...dedupedMissingKeyIds.map((keyId) => ({
-                keyId: { keyId }
-            }))
-        ];
-        const protocolMessage = {
-            type: proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE,
-            appStateSyncKeyShare: {
-                keys: keyShareEntries
-            }
-        };
-        await this.publishProtocolMessageToDevice(normalizedTo, protocolMessage);
-        this.logger.info('app-state sync key share sent', {
-            to: normalizedTo,
-            keys: dedupedKeys.length,
-            orphanKeys: dedupedMissingKeyIds.length
-        });
+        await this.appStateSyncKeyProtocol.sendKeyShare(toDeviceJid, keys, missingKeyIds);
     }
     async mutateParticipantsCacheFromGroupEvent(event) {
-        const groupJid = this.resolveGroupJidForParticipantCacheEvent(event);
-        if (!groupJid) {
-            return;
-        }
-        if (event.action === 'delete') {
-            await this.participantsStore.deleteGroupParticipants(groupJid);
-            return;
-        }
-        const participantUsers = this.extractParticipantUsersFromGroupEvent(event);
-        if (event.action === 'create') {
-            if (participantUsers.length === 0) {
-                return;
-            }
-            await this.participantsStore.upsertGroupParticipants({
-                groupJid,
-                participants: participantUsers,
-                updatedAtMs: Date.now()
-            });
-            return;
-        }
-        const cached = await this.participantsStore.getGroupParticipants(groupJid);
-        if (!cached || cached.participants.length === 0) {
-            return;
-        }
-        const cachedParticipants = this.sanitizeParticipantUsers(cached.participants);
-        if (cachedParticipants.length === 0) {
-            return;
-        }
-        if (event.action === 'add' ||
-            event.action === 'promote' ||
-            event.action === 'demote' ||
-            event.action === 'linked_group_promote' ||
-            event.action === 'linked_group_demote') {
-            await this.mergeParticipantUsersIntoCache(groupJid, cachedParticipants, participantUsers);
-            return;
-        }
-        if (event.action === 'remove') {
-            await this.removeParticipantUsersFromCache(groupJid, cachedParticipants, participantUsers);
-            return;
-        }
-        if (event.action === 'modify') {
-            const authorUsers = event.authorJid
-                ? this.sanitizeParticipantUsers([event.authorJid])
-                : [];
-            await this.replaceParticipantUsersInCache(groupJid, cachedParticipants, authorUsers, participantUsers);
-        }
-    }
-    async publishProtocolMessageToDevice(deviceJid, protocolMessage) {
-        const plaintext = await writeRandomPadMax16(proto.Message.encode({
-            protocolMessage
-        }).finish());
-        await this.publishSignalMessage({
-            to: deviceJid,
-            plaintext,
-            type: 'protocol',
-            category: 'peer',
-            pushPriority: 'high'
-        });
-    }
-    async resolveOwnPeerDeviceJids() {
-        const meJid = this.requireCurrentMeJid('resolveOwnPeerDeviceJids');
-        const meUserJid = toUserJid(meJid);
-        const meDevices = new Set();
-        meDevices.add(normalizeDeviceJid(meJid));
-        const meLid = this.getCurrentMeLid();
-        if (meLid && meLid.includes('@')) {
-            try {
-                meDevices.add(normalizeDeviceJid(meLid));
-            }
-            catch (error) {
-                this.logger.trace('ignoring malformed me lid jid while resolving peer devices', {
-                    meLid,
-                    message: toError(error).message
-                });
-            }
-        }
-        try {
-            const synced = await this.signalDeviceSync.syncDeviceList([meUserJid]);
-            const peerDevices = new Set();
-            for (const entry of synced) {
-                const sourceDevices = entry.deviceJids.length > 0 ? entry.deviceJids : [entry.jid];
-                for (const deviceJid of sourceDevices) {
-                    try {
-                        const normalized = normalizeDeviceJid(deviceJid);
-                        if (meDevices.has(normalized)) {
-                            continue;
-                        }
-                        peerDevices.add(normalized);
-                    }
-                    catch (error) {
-                        this.logger.trace('ignoring malformed peer device jid while resolving app-state peers', {
-                            deviceJid,
-                            message: toError(error).message
-                        });
-                    }
-                }
-            }
-            return [...peerDevices];
-        }
-        catch (error) {
-            this.logger.warn('failed to resolve peer devices for app-state key request', {
-                message: toError(error).message
-            });
-            return [];
-        }
-    }
-    normalizeKeyIds(keyIds) {
-        const deduped = new Map();
-        for (const keyId of keyIds) {
-            if (keyId.byteLength === 0) {
-                continue;
-            }
-            const keyHex = bytesToHex(keyId);
-            if (deduped.has(keyHex)) {
-                continue;
-            }
-            deduped.set(keyHex, keyId);
-        }
-        return [...deduped.values()];
-    }
-    async publishWithRetryTracking(args, publish) {
-        const nowMs = Date.now();
-        const expiresAtMs = nowMs + this.retryTtlMs;
-        const hintedMessageId = args.messageIdHint?.trim();
-        const resolvedToJid = args.toJid ?? (args.replayPayload.mode === 'opaque_node' ? '' : args.replayPayload.to);
-        let hintedPersisted = false;
-        if (hintedMessageId) {
-            hintedPersisted = await this.safeUpsertRetryOutboundRecord(this.createRetryOutboundRecord({
-                messageId: hintedMessageId,
-                toJid: resolvedToJid,
-                participantJid: args.participantJid,
-                recipientJid: args.recipientJid,
-                messageType: args.messageType,
-                replayPayload: args.replayPayload,
-                createdAtMs: nowMs,
-                updatedAtMs: nowMs,
-                expiresAtMs
-            }));
-        }
-        const result = await publish();
-        if (hintedPersisted && hintedMessageId && result.id === hintedMessageId) {
-            // Hint and final message id matched; avoid a second equivalent upsert on the hot path.
-            return result;
-        }
-        const persistedNowMs = Date.now();
-        await this.safeUpsertRetryOutboundRecord(this.createRetryOutboundRecord({
-            messageId: result.id,
-            toJid: resolvedToJid,
-            participantJid: args.participantJid,
-            recipientJid: args.recipientJid,
-            messageType: args.messageType,
-            replayPayload: args.replayPayload,
-            createdAtMs: hintedMessageId ? nowMs : persistedNowMs,
-            updatedAtMs: persistedNowMs,
-            expiresAtMs: persistedNowMs + this.retryTtlMs
-        }));
-        return result;
-    }
-    createRetryOutboundRecord(input) {
-        return {
-            messageId: input.messageId,
-            toJid: input.toJid,
-            participantJid: input.participantJid,
-            recipientJid: input.recipientJid,
-            messageType: input.messageType,
-            replayMode: input.replayPayload.mode,
-            replayPayload: encodeRetryReplayPayload(input.replayPayload),
-            state: 'pending',
-            createdAtMs: input.createdAtMs,
-            updatedAtMs: input.updatedAtMs,
-            expiresAtMs: input.expiresAtMs
-        };
-    }
-    async safeUpsertRetryOutboundRecord(record) {
-        try {
-            await this.retryStore.upsertOutboundMessage(record);
-        }
-        catch (error) {
-            this.logger.warn('failed to persist retry outbound message record', {
-                messageId: record.messageId,
-                to: record.toJid,
-                mode: record.replayMode,
-                message: toError(error).message
-            });
-            return false;
-        }
-        try {
-            await this.retryStore.cleanupExpired(Date.now());
-        }
-        catch (error) {
-            this.logger.warn('failed to cleanup retry records after outbound persist', {
-                message: toError(error).message
-            });
-        }
-        return true;
+        await this.participantsCache.mutateFromGroupEvent(event);
     }
     shouldUseGroupDirectPath(message) {
         const protocolType = message.protocolMessage?.type;
@@ -405,41 +156,50 @@ export class WaMessageDispatchCoordinator {
         }
         return message.keepInChatMessage?.keepType === proto.KeepType.UNDO_KEEP_FOR_ALL;
     }
-    async publishGroupDirectMessage(groupJid, plaintext, type, options, retryContext = {}) {
+    async publishGroupDirectMessage(groupJid, message, plaintext, type, options, retryContext = {}) {
+        const sendOptions = await this.withResolvedMessageId(options);
         const meJid = this.requireCurrentMeJid('sendMessage');
         const participantUserJids = retryContext.forceRefreshParticipants
-            ? await this.refreshGroupParticipantUsers(groupJid)
-            : await this.resolveGroupParticipantUsers(groupJid);
+            ? await this.participantsCache.refreshParticipantUsers(groupJid)
+            : await this.participantsCache.resolveParticipantUsers(groupJid);
         const addressingMode = retryContext.forceAddressingMode ??
             this.resolveGroupAddressingMode(participantUserJids, groupJid);
         const senderForPhash = this.resolveSenderForAddressingMode(addressingMode, meJid);
-        const fanoutDeviceJids = await this.resolveGroupParticipantDeviceJids(participantUserJids);
+        const fanoutDeviceJids = await this.fanoutResolver.resolveGroupParticipantDeviceJids(participantUserJids);
         if (fanoutDeviceJids.length === 0) {
             throw new Error('group direct send resolved no target devices');
         }
-        await this.ensureSignalSessionsBatch(fanoutDeviceJids);
-        const participants = await Promise.all(fanoutDeviceJids.map(async (targetJid) => {
-            const address = parseSignalAddressFromJid(targetJid);
-            await this.ensureSignalSession(address, targetJid);
-            const encrypted = await this.signalProtocol.encryptMessage(address, plaintext);
-            return {
-                jid: targetJid,
-                encType: encrypted.type,
-                ciphertext: encrypted.ciphertext
-            };
+        await this.sessionResolver.ensureSessionsBatch(fanoutDeviceJids);
+        const participantAddresses = fanoutDeviceJids.map((targetJid) => parseSignalAddressFromJid(targetJid));
+        const encryptedParticipants = await this.signalProtocol.encryptMessagesBatch(participantAddresses.map((address) => ({
+            address,
+            plaintext
+        })));
+        const participants = fanoutDeviceJids.map((targetJid, index) => ({
+            jid: targetJid,
+            encType: encryptedParticipants[index].type,
+            ciphertext: encryptedParticipants[index].ciphertext
         }));
         const shouldAttachDeviceIdentity = participants.some((participant) => participant.encType === 'pkmsg');
         const localPhash = await computePhashV2([...fanoutDeviceJids, senderForPhash]);
+        const reportingArtifacts = await this.tryBuildReportingTokenArtifacts({
+            message,
+            stanzaId: sendOptions.id,
+            senderUserJid: toUserJid(senderForPhash),
+            remoteJid: groupJid,
+            context: 'group_direct'
+        });
         const messageNode = buildGroupDirectMessageNode({
             to: groupJid,
             type,
-            id: options.id,
+            id: sendOptions.id,
             phash: localPhash,
             addressingMode,
             participants,
             deviceIdentity: shouldAttachDeviceIdentity
                 ? this.getEncodedSignedDeviceIdentity()
-                : undefined
+                : undefined,
+            reportingNode: reportingArtifacts?.node ?? undefined
         });
         const replayPayload = {
             mode: 'plaintext',
@@ -447,12 +207,12 @@ export class WaMessageDispatchCoordinator {
             type,
             plaintext
         };
-        const result = await this.publishWithRetryTracking({
-            messageIdHint: options.id ?? messageNode.attrs.id,
+        const result = await this.retryTracker.track({
+            messageIdHint: sendOptions.id ?? messageNode.attrs.id,
             toJid: groupJid,
-            messageType: type,
+            type,
             replayPayload
-        }, async () => this.messageClient.publishNode(messageNode, options));
+        }, async () => this.messageClient.publishNode(messageNode, sendOptions));
         const ackError = result.ack.error;
         const serverPhash = result.ack.phash;
         const serverAddressingMode = result.ack.addressingMode;
@@ -470,8 +230,8 @@ export class WaMessageDispatchCoordinator {
                 serverAddressingMode,
                 ackError
             });
-            return this.publishGroupDirectMessage(groupJid, plaintext, type, {
-                ...options,
+            return this.publishGroupDirectMessage(groupJid, message, plaintext, type, {
+                ...sendOptions,
                 id: result.id
             }, {
                 retried: true,
@@ -481,11 +241,12 @@ export class WaMessageDispatchCoordinator {
         }
         return result;
     }
-    async publishGroupSenderKeyMessage(groupJid, plaintext, type, options, retryContext = {}) {
+    async publishGroupSenderKeyMessage(groupJid, message, plaintext, type, options, retryContext = {}) {
+        const sendOptions = await this.withResolvedMessageId(options);
         const meJid = this.requireCurrentMeJid('sendMessage');
         const participantUserJids = retryContext.forceRefreshParticipants
-            ? await this.refreshGroupParticipantUsers(groupJid)
-            : await this.resolveGroupParticipantUsers(groupJid);
+            ? await this.participantsCache.refreshParticipantUsers(groupJid)
+            : await this.participantsCache.resolveParticipantUsers(groupJid);
         const addressingMode = retryContext.forceAddressingMode ??
             this.resolveGroupAddressingMode(participantUserJids, groupJid);
         const senderJid = this.resolveSenderForAddressingMode(addressingMode, meJid);
@@ -496,17 +257,25 @@ export class WaMessageDispatchCoordinator {
         const { fanoutDeviceJids, distributionParticipants } = distributionData;
         const shouldAttachDeviceIdentity = distributionParticipants.some((participant) => participant.encType === 'pkmsg');
         const localPhash = await computePhashV2([...fanoutDeviceJids, senderJid]);
+        const reportingArtifacts = await this.tryBuildReportingTokenArtifacts({
+            message,
+            stanzaId: sendOptions.id,
+            senderUserJid: toUserJid(senderJid),
+            remoteJid: groupJid,
+            context: 'group_sender_key'
+        });
         const messageNode = buildGroupSenderKeyMessageNode({
             to: groupJid,
             type,
-            id: options.id,
+            id: sendOptions.id,
             phash: localPhash,
             addressingMode,
             groupCiphertext: groupCiphertext.ciphertext,
             participants: distributionParticipants,
             deviceIdentity: shouldAttachDeviceIdentity
                 ? this.getEncodedSignedDeviceIdentity()
-                : undefined
+                : undefined,
+            reportingNode: reportingArtifacts?.node ?? undefined
         });
         const replayPayload = {
             mode: 'plaintext',
@@ -514,12 +283,12 @@ export class WaMessageDispatchCoordinator {
             type,
             plaintext
         };
-        const result = await this.publishWithRetryTracking({
-            messageIdHint: options.id ?? messageNode.attrs.id,
+        const result = await this.retryTracker.track({
+            messageIdHint: sendOptions.id ?? messageNode.attrs.id,
             toJid: groupJid,
-            messageType: type,
+            type,
             replayPayload
-        }, async () => this.messageClient.publishNode(messageNode, options));
+        }, async () => this.messageClient.publishNode(messageNode, sendOptions));
         const distributedAddresses = distributionParticipants.map((participant) => participant.address);
         try {
             await this.senderKeyManager.markSenderKeyDistributed(groupJid, sender, distributedAddresses);
@@ -548,8 +317,8 @@ export class WaMessageDispatchCoordinator {
                 serverAddressingMode,
                 ackError
             });
-            return this.publishGroupSenderKeyMessage(groupJid, plaintext, type, {
-                ...options,
+            return this.publishGroupSenderKeyMessage(groupJid, message, plaintext, type, {
+                ...sendOptions,
                 id: result.id
             }, {
                 retried: true,
@@ -559,137 +328,6 @@ export class WaMessageDispatchCoordinator {
         }
         return result;
     }
-    async resolveGroupParticipantUsers(groupJid) {
-        const cached = await this.participantsStore.getGroupParticipants(groupJid);
-        if (cached && cached.participants.length > 0) {
-            return this.sanitizeParticipantUsers(cached.participants);
-        }
-        return this.refreshGroupParticipantUsers(groupJid);
-    }
-    resolveGroupJidForParticipantCacheEvent(event) {
-        if (event.action === 'linked_group_promote' || event.action === 'linked_group_demote') {
-            return event.contextGroupJid ?? event.groupJid ?? null;
-        }
-        return event.groupJid ?? null;
-    }
-    extractParticipantUsersFromGroupEvent(event) {
-        const candidates = [];
-        for (const participant of event.participants ?? []) {
-            if (participant.jid) {
-                candidates.push(participant.jid);
-            }
-            if (participant.lidJid) {
-                candidates.push(participant.lidJid);
-            }
-            if (participant.phoneJid) {
-                candidates.push(participant.phoneJid);
-            }
-        }
-        return this.sanitizeParticipantUsers(candidates);
-    }
-    async mergeParticipantUsersIntoCache(groupJid, cachedParticipants, participantsToAdd) {
-        if (participantsToAdd.length === 0) {
-            return;
-        }
-        const nextParticipants = [...cachedParticipants];
-        const existing = new Set(cachedParticipants);
-        for (const participant of participantsToAdd) {
-            if (existing.has(participant)) {
-                continue;
-            }
-            existing.add(participant);
-            nextParticipants.push(participant);
-        }
-        if (nextParticipants.length === cachedParticipants.length) {
-            return;
-        }
-        await this.participantsStore.upsertGroupParticipants({
-            groupJid,
-            participants: nextParticipants,
-            updatedAtMs: Date.now()
-        });
-    }
-    async removeParticipantUsersFromCache(groupJid, cachedParticipants, participantsToRemove) {
-        if (participantsToRemove.length === 0) {
-            return;
-        }
-        const removed = new Set(participantsToRemove);
-        const nextParticipants = cachedParticipants.filter((participant) => !removed.has(participant));
-        if (nextParticipants.length === cachedParticipants.length) {
-            return;
-        }
-        if (nextParticipants.length === 0) {
-            await this.participantsStore.deleteGroupParticipants(groupJid);
-            return;
-        }
-        await this.participantsStore.upsertGroupParticipants({
-            groupJid,
-            participants: nextParticipants,
-            updatedAtMs: Date.now()
-        });
-    }
-    async replaceParticipantUsersInCache(groupJid, cachedParticipants, participantsToReplace, replacementParticipants) {
-        const toReplace = new Set(participantsToReplace);
-        const nextParticipants = cachedParticipants.filter((participant) => !toReplace.has(participant));
-        const existing = new Set(nextParticipants);
-        for (const participant of replacementParticipants) {
-            if (existing.has(participant)) {
-                continue;
-            }
-            existing.add(participant);
-            nextParticipants.push(participant);
-        }
-        if (this.areParticipantListsEqual(cachedParticipants, nextParticipants)) {
-            return;
-        }
-        if (nextParticipants.length === 0) {
-            await this.participantsStore.deleteGroupParticipants(groupJid);
-            return;
-        }
-        await this.participantsStore.upsertGroupParticipants({
-            groupJid,
-            participants: nextParticipants,
-            updatedAtMs: Date.now()
-        });
-    }
-    areParticipantListsEqual(left, right) {
-        if (left.length !== right.length) {
-            return false;
-        }
-        for (let index = 0; index < left.length; index += 1) {
-            if (left[index] !== right[index]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    async refreshGroupParticipantUsers(groupJid) {
-        const queried = await this.queryGroupParticipantJids(groupJid);
-        const participants = this.sanitizeParticipantUsers(queried);
-        await this.participantsStore.upsertGroupParticipants({
-            groupJid,
-            participants,
-            updatedAtMs: Date.now()
-        });
-        return participants;
-    }
-    sanitizeParticipantUsers(participants) {
-        const deduped = new Set();
-        for (const participant of participants) {
-            if (!participant || !participant.includes('@'))
-                continue;
-            try {
-                deduped.add(toUserJid(participant));
-            }
-            catch (error) {
-                this.logger.trace('ignoring malformed participant jid', {
-                    participant,
-                    message: toError(error).message
-                });
-            }
-        }
-        return [...deduped];
-    }
     resolveGroupAddressingMode(participantUserJids, groupJid) {
         for (const participantJid of participantUserJids) {
             try {
@@ -728,111 +366,95 @@ export class WaMessageDispatchCoordinator {
         const distributionPayload = await writeRandomPadMax16(proto.Message.encode({
             senderKeyDistributionMessage
         }).finish());
-        const fanoutDeviceJids = await this.resolveGroupParticipantDeviceJids(participantUserJids);
+        const fanoutDeviceJids = await this.fanoutResolver.resolveGroupParticipantDeviceJids(participantUserJids);
         if (fanoutDeviceJids.length === 0) {
             return {
                 fanoutDeviceJids,
                 distributionParticipants: []
             };
         }
-        const fanoutTargets = fanoutDeviceJids.map((jid) => ({
-            jid,
-            address: parseSignalAddressFromJid(jid)
-        }));
-        const pendingAddresses = await this.senderKeyManager.filterParticipantsNeedingDistribution(groupJid, sender, fanoutTargets.map((target) => target.address));
+        const fanoutTargetsByAddressKey = new Map();
+        const fanoutAddresses = new Array(fanoutDeviceJids.length);
+        for (let index = 0; index < fanoutDeviceJids.length; index += 1) {
+            const jid = fanoutDeviceJids[index];
+            const address = parseSignalAddressFromJid(jid);
+            fanoutAddresses[index] = address;
+            fanoutTargetsByAddressKey.set(signalAddressKey(address), { jid, address });
+        }
+        const pendingAddresses = await this.senderKeyManager.filterParticipantsNeedingDistribution(groupJid, sender, fanoutAddresses);
         if (pendingAddresses.length === 0) {
             return {
                 fanoutDeviceJids,
                 distributionParticipants: []
             };
         }
-        const pendingAddressKeys = new Set(pendingAddresses.map(signalAddressKey));
-        const pendingTargets = fanoutTargets.filter((target) => pendingAddressKeys.has(signalAddressKey(target.address)));
+        const pendingAddressKeys = new Set();
+        const pendingTargets = [];
+        for (let index = 0; index < pendingAddresses.length; index += 1) {
+            const key = signalAddressKey(pendingAddresses[index]);
+            if (pendingAddressKeys.has(key)) {
+                continue;
+            }
+            pendingAddressKeys.add(key);
+            const target = fanoutTargetsByAddressKey.get(key);
+            if (target) {
+                pendingTargets.push(target);
+            }
+        }
         if (pendingTargets.length === 0) {
             return {
                 fanoutDeviceJids,
                 distributionParticipants: []
             };
         }
-        await this.ensureSignalSessionsBatch(pendingTargets.map((target) => target.jid));
-        const distributionParticipants = await Promise.all(pendingTargets.map(async (target) => {
-            await this.ensureSignalSession(target.address, target.jid);
-            const encrypted = await this.signalProtocol.encryptMessage(target.address, distributionPayload);
-            return {
-                jid: target.jid,
-                address: target.address,
-                encType: encrypted.type,
-                ciphertext: encrypted.ciphertext
-            };
-        }));
-        return {
-            fanoutDeviceJids,
-            distributionParticipants
-        };
-    }
-    async resolveGroupParticipantDeviceJids(participantUserJids) {
-        const meDeviceJids = new Set();
-        const meJid = this.getCurrentMeJid();
-        if (meJid) {
-            try {
-                meDeviceJids.add(normalizeDeviceJid(meJid));
-            }
-            catch (error) {
-                this.logger.trace('ignoring malformed me jid', {
-                    meJid,
-                    message: toError(error).message
-                });
-            }
-        }
-        const meLid = this.getCurrentMeLid();
-        if (meLid && meLid.includes('@')) {
-            try {
-                meDeviceJids.add(normalizeDeviceJid(meLid));
-            }
-            catch (error) {
-                this.logger.trace('ignoring malformed me lid jid', {
-                    meLid,
-                    message: toError(error).message
-                });
-            }
-        }
-        const candidateUsers = [...new Set(participantUserJids)];
-        if (candidateUsers.length === 0) {
-            return [];
+        const pendingTargetJids = new Array(pendingTargets.length);
+        for (let index = 0; index < pendingTargets.length; index += 1) {
+            pendingTargetJids[index] = pendingTargets[index].jid;
         }
         try {
-            const synced = await this.signalDeviceSync.syncDeviceList(candidateUsers);
-            const fanout = new Set();
-            for (const entry of synced) {
-                if (entry.deviceJids.length === 0) {
-                    const normalizedEntryJid = normalizeDeviceJid(entry.jid);
-                    if (meDeviceJids.has(normalizedEntryJid))
-                        continue;
-                    fanout.add(normalizedEntryJid);
-                    continue;
-                }
-                for (const deviceJid of entry.deviceJids) {
-                    const normalizedDeviceJid = normalizeDeviceJid(deviceJid);
-                    if (meDeviceJids.has(normalizedDeviceJid))
-                        continue;
-                    fanout.add(normalizedDeviceJid);
-                }
-            }
-            return [...fanout];
+            await this.sessionResolver.ensureSessionsBatch(pendingTargetJids);
         }
         catch (error) {
-            this.logger.warn('group participant device sync failed, falling back to participant user jids', {
-                participants: candidateUsers.length,
+            this.logger.warn('group sender-key distribution session sync failed, continuing with available sessions', {
+                groupJid,
+                requested: pendingTargetJids.length,
                 message: toError(error).message
             });
-            return [...new Set(candidateUsers.map((jid) => normalizeDeviceJid(jid)))].filter((jid) => !meDeviceJids.has(jid));
         }
+        const hasPendingSessions = await this.signalProtocol.hasSessions(pendingTargets.map((target) => target.address));
+        const availableTargets = pendingTargets.filter((_target, index) => hasPendingSessions[index]);
+        if (availableTargets.length === 0) {
+            return {
+                fanoutDeviceJids,
+                distributionParticipants: []
+            };
+        }
+        const encryptedDistributionParticipants = await this.signalProtocol.encryptMessagesBatch(availableTargets.map((target) => ({
+            address: target.address,
+            plaintext: distributionPayload
+        })));
+        const distributionParticipants = availableTargets.map((target, index) => ({
+            jid: target.jid,
+            address: target.address,
+            encType: encryptedDistributionParticipants[index].type,
+            ciphertext: encryptedDistributionParticipants[index].ciphertext
+        }));
+        return {
+            fanoutDeviceJids,
+            distributionParticipants
+        };
     }
     async publishDirectSignalMessageWithFanout(recipientJid, message, plaintext, type, options) {
+        const sendOptions = await this.withResolvedMessageId(options);
         const meJid = this.requireCurrentMeJid('sendMessage');
         const meLid = this.getCurrentMeLid();
-        const selfDeviceJidForRecipient = this.resolveSelfDeviceJidForRecipient(recipientJid, meJid, meLid);
-        const deviceJids = await this.resolveDirectFanoutDeviceJids(recipientJid, selfDeviceJidForRecipient);
+        const selfDeviceJidForRecipient = this.fanoutResolver.resolveSelfDeviceJidForRecipient(recipientJid, meJid, meLid);
+        const deviceJids = await this.fanoutResolver.resolveDirectFanoutDeviceJids(recipientJid, selfDeviceJidForRecipient);
+        const targets = deviceJids.map((jid) => ({
+            jid,
+            normalizedJid: normalizeDeviceJid(jid),
+            userJid: toUserJid(jid)
+        }));
         const recipientUserJid = toUserJid(recipientJid);
         const meUserJid = toUserJid(selfDeviceJidForRecipient);
         this.logger.debug('wa client publish signal fanout', {
@@ -841,44 +463,55 @@ export class WaMessageDispatchCoordinator {
             type
         });
         const expectedIdentityByJid = new Map();
-        if (options.expectedIdentity) {
-            for (let index = 0; index < deviceJids.length; index += 1) {
-                const targetJid = deviceJids[index];
-                if (toUserJid(targetJid) === recipientUserJid) {
-                    expectedIdentityByJid.set(normalizeDeviceJid(targetJid), options.expectedIdentity);
+        if (sendOptions.expectedIdentity) {
+            for (let index = 0; index < targets.length; index += 1) {
+                const target = targets[index];
+                if (target.userJid === recipientUserJid) {
+                    expectedIdentityByJid.set(target.normalizedJid, sendOptions.expectedIdentity);
                 }
             }
         }
-        await this.ensureSignalSessionsBatch(deviceJids, expectedIdentityByJid);
-        const hasSelfDeviceFanout = deviceJids.some((targetJid) => toUserJid(targetJid) === meUserJid);
+        await this.sessionResolver.ensureSessionsBatch(deviceJids, expectedIdentityByJid);
+        const hasSelfDeviceFanout = targets.some((target) => target.userJid === meUserJid);
         const selfDevicePlaintext = hasSelfDeviceFanout
             ? await writeRandomPadMax16(proto.Message.encode(wrapDeviceSentMessage(message, recipientUserJid)).finish())
             : null;
-        const participants = await Promise.all(deviceJids.map(async (targetJid) => {
-            const address = parseSignalAddressFromJid(targetJid);
-            const targetUserJid = toUserJid(targetJid);
-            const expectedIdentity = targetUserJid === recipientUserJid ? options.expectedIdentity : undefined;
-            const plaintextForTarget = selfDevicePlaintext && targetUserJid === meUserJid
+        const participantRequests = targets.map((target) => ({
+            target,
+            address: parseSignalAddressFromJid(target.jid),
+            expectedIdentity: target.userJid === recipientUserJid ? sendOptions.expectedIdentity : undefined,
+            plaintext: selfDevicePlaintext && target.userJid === meUserJid
                 ? selfDevicePlaintext
-                : plaintext;
-            await this.ensureSignalSession(address, targetJid, expectedIdentity);
-            const encrypted = await this.signalProtocol.encryptMessage(address, plaintextForTarget, expectedIdentity);
-            return {
-                jid: targetJid,
-                encType: encrypted.type,
-                ciphertext: encrypted.ciphertext
-            };
+                : plaintext
+        }));
+        const encryptedParticipants = await this.signalProtocol.encryptMessagesBatch(participantRequests.map((request) => ({
+            address: request.address,
+            plaintext: request.plaintext,
+            expectedIdentity: request.expectedIdentity
+        })));
+        const participants = participantRequests.map((request, index) => ({
+            jid: request.target.jid,
+            encType: encryptedParticipants[index].type,
+            ciphertext: encryptedParticipants[index].ciphertext
         }));
         const shouldAttachDeviceIdentity = participants.some((participant) => participant.encType === 'pkmsg');
         const deviceIdentity = shouldAttachDeviceIdentity
             ? this.getEncodedSignedDeviceIdentity()
             : undefined;
+        const reportingArtifacts = await this.tryBuildReportingTokenArtifacts({
+            message,
+            stanzaId: sendOptions.id,
+            senderUserJid: meUserJid,
+            remoteJid: recipientUserJid,
+            context: 'direct_fanout'
+        });
         const messageNode = buildDirectMessageFanoutNode({
             to: recipientJid,
             type,
-            id: options.id,
+            id: sendOptions.id,
             participants,
-            deviceIdentity
+            deviceIdentity,
+            reportingNode: reportingArtifacts?.node ?? undefined
         });
         const replayPayload = {
             mode: 'plaintext',
@@ -886,130 +519,72 @@ export class WaMessageDispatchCoordinator {
             type,
             plaintext
         };
-        return this.publishWithRetryTracking({
-            messageIdHint: options.id ?? messageNode.attrs.id,
+        return this.retryTracker.track({
+            messageIdHint: sendOptions.id ?? messageNode.attrs.id,
             toJid: recipientJid,
-            messageType: type,
+            type,
             replayPayload
-        }, async () => this.messageClient.publishNode(messageNode, options));
+        }, async () => this.messageClient.publishNode(messageNode, sendOptions));
     }
-    async ensureSignalSessionsBatch(targetJids, expectedIdentityByJid = new Map()) {
-        const normalizedTargetJids = [...new Set(targetJids.map((jid) => normalizeDeviceJid(jid)))];
-        if (normalizedTargetJids.length === 0) {
-            return;
-        }
-        const normalizedTargets = normalizedTargetJids.map((jid) => ({
-            jid,
-            address: parseSignalAddressFromJid(jid)
-        }));
-        const hasSessions = await this.signalProtocol.hasSessions(normalizedTargets.map((target) => target.address));
-        const missingTargets = normalizedTargets.filter((_, index) => !hasSessions[index]);
-        if (missingTargets.length === 0) {
-            return;
+    async withResolvedMessageId(options) {
+        const normalizedId = options.id?.trim();
+        if (normalizedId) {
+            if (normalizedId === options.id) {
+                return options;
+            }
+            return {
+                ...options,
+                id: normalizedId
+            };
         }
+        return {
+            ...options,
+            id: await this.generateOutgoingMessageId()
+        };
+    }
+    async generateOutgoingMessageId() {
         try {
-            const batchResults = await this.signalSessionSync.fetchKeyBundles(missingTargets.map((target) => ({ jid: target.jid })));
-            const resultByJid = new Map(batchResults.map((result) => [normalizeDeviceJid(result.jid), result]));
-            const fallbackJids = [];
-            const establishPromises = [];
-            for (let index = 0; index < missingTargets.length; index += 1) {
-                const target = missingTargets[index];
-                const result = resultByJid.get(target.jid);
-                if (!result || !('bundle' in result)) {
-                    fallbackJids.push(target.jid);
-                    continue;
-                }
-                const expectedIdentity = expectedIdentityByJid.get(target.jid);
-                const remoteIdentity = toSerializedPubKey(result.bundle.identity);
-                if (expectedIdentity &&
-                    !uint8Equal(remoteIdentity, toSerializedPubKey(expectedIdentity))) {
-                    throw new Error('identity mismatch');
-                }
-                establishPromises.push(this.signalProtocol
-                    .establishOutgoingSession(target.address, result.bundle)
-                    .then(() => {
-                    this.logger.debug('signal session synchronized from batch key fetch', {
-                        jid: target.jid,
-                        regId: result.bundle.regId,
-                        hasOneTimeKey: result.bundle.oneTimeKey !== undefined
-                    });
-                }));
-            }
-            await Promise.all(establishPromises);
-            if (fallbackJids.length === 0) {
-                return;
-            }
-            this.logger.warn('signal batch key fetch returned partial errors, falling back to single requests', {
-                requested: missingTargets.length,
-                fallbackTargets: fallbackJids.length
-            });
-            for (let index = 0; index < fallbackJids.length; index += 1) {
-                const jid = fallbackJids[index];
-                const address = parseSignalAddressFromJid(jid);
-                await this.ensureSignalSession(address, jid, expectedIdentityByJid.get(jid));
-            }
+            const meUserJid = toUserJid(this.requireCurrentMeJid('sendMessage'));
+            const timestampSeconds = Math.floor(Date.now() / 1000);
+            const timestampBytes = new Uint8Array(8);
+            new DataView(timestampBytes.buffer, timestampBytes.byteOffset, timestampBytes.byteLength).setBigUint64(0, BigInt(timestampSeconds), false);
+            const entropy = concatBytes([
+                timestampBytes,
+                TEXT_ENCODER.encode(meUserJid),
+                await randomBytesAsync(8)
+            ]);
+            const digest = await sha256(entropy);
+            return `3EB0${bytesToHex(digest.subarray(0, 9)).toUpperCase()}`;
         }
         catch (error) {
-            const normalized = toError(error);
-            if (normalized.message === 'identity mismatch') {
-                throw normalized;
-            }
-            this.logger.warn('signal batch key fetch failed, falling back to single requests', {
-                requested: missingTargets.length,
-                message: normalized.message
+            this.logger.warn('failed to generate sha256 message id, falling back to random id', {
+                message: toError(error).message
             });
-            for (let index = 0; index < missingTargets.length; index += 1) {
-                const target = missingTargets[index];
-                await this.ensureSignalSession(target.address, target.jid, expectedIdentityByJid.get(target.jid));
-            }
+            return `3EB0${bytesToHex(await randomBytesAsync(8)).toUpperCase()}`;
         }
     }
-    async resolveDirectFanoutDeviceJids(recipientJid, selfDeviceJidForRecipient) {
-        const recipientUserJid = toUserJid(recipientJid);
-        const meUserJid = toUserJid(selfDeviceJidForRecipient);
-        const targets = recipientUserJid === meUserJid ? [recipientUserJid] : [recipientUserJid, meUserJid];
+    async tryBuildReportingTokenArtifacts(input) {
+        if (!input.stanzaId) {
+            return null;
+        }
         try {
-            const synced = await this.signalDeviceSync.syncDeviceList(targets);
-            const byUser = new Map(synced.map((entry) => [toUserJid(entry.jid), entry.deviceJids]));
-            const fanout = new Set();
-            const recipientDevices = byUser.get(recipientUserJid) ?? [];
-            if (recipientDevices.length === 0) {
-                fanout.add(recipientUserJid);
-            }
-            else {
-                for (let index = 0; index < recipientDevices.length; index += 1) {
-                    fanout.add(recipientDevices[index]);
-                }
-            }
-            const meDevices = byUser.get(meUserJid) ?? [];
-            const normalizedMeJid = normalizeDeviceJid(selfDeviceJidForRecipient);
-            for (let index = 0; index < meDevices.length; index += 1) {
-                const deviceJid = meDevices[index];
-                if (normalizeDeviceJid(deviceJid) === normalizedMeJid) {
-                    continue;
-                }
-                fanout.add(deviceJid);
-            }
-            return [...fanout];
+            return await buildReportingTokenArtifacts({
+                message: input.message,
+                stanzaId: input.stanzaId,
+                senderUserJid: input.senderUserJid,
+                remoteJid: input.remoteJid
+            });
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
-            this.logger.warn('signal device fanout sync failed, falling back to direct recipient', {
-                to: recipientJid,
-                message
+            this.logger.warn('failed to generate reporting token', {
+                context: input.context,
+                id: input.stanzaId,
+                remoteJid: input.remoteJid,
+                message: toError(error).message
             });
-            return [recipientUserJid];
+            return null;
         }
     }
-    resolveSelfDeviceJidForRecipient(recipientJid, meJid, meLid) {
-        if (splitJid(recipientJid).server !== 'lid') {
-            return meJid;
-        }
-        if (!meLid || !meLid.includes('@')) {
-            return meJid;
-        }
-        return meLid;
-    }
     getEncodedSignedDeviceIdentity() {
         const signedIdentity = this.getCurrentSignedIdentity();
         if (!signedIdentity) {
@@ -1017,36 +592,6 @@ export class WaMessageDispatchCoordinator {
         }
         return proto.ADVSignedDeviceIdentity.encode(signedIdentity).finish();
     }
-    async ensureSignalSession(address, jid, expectedIdentity, reasonIdentity = false) {
-        this.requireCurrentMeJid('ensureSignalSession');
-        if (reasonIdentity) {
-            await this.signalIdentitySync.syncIdentityKeys([jid]);
-        }
-        if (await this.signalProtocol.hasSession(address)) {
-            return;
-        }
-        this.logger.info('signal session missing, fetching remote key bundle', { jid });
-        const fetched = await this.signalSessionSync.fetchKeyBundle({
-            jid,
-            reasonIdentity
-        });
-        const remoteIdentity = toSerializedPubKey(fetched.bundle.identity);
-        if (reasonIdentity) {
-            const storedIdentity = await this.signalStore.getRemoteIdentity(address);
-            if (storedIdentity && !uint8Equal(remoteIdentity, storedIdentity)) {
-                throw new Error('identity mismatch');
-            }
-        }
-        if (expectedIdentity && !uint8Equal(remoteIdentity, toSerializedPubKey(expectedIdentity))) {
-            throw new Error('identity mismatch');
-        }
-        await this.signalProtocol.establishOutgoingSession(address, fetched.bundle);
-        this.logger.info('signal session synchronized', {
-            jid,
-            regId: fetched.bundle.regId,
-            hasOneTimeKey: fetched.bundle.oneTimeKey !== undefined
-        });
-    }
     requireCurrentMeJid(context) {
         const meJid = this.getCurrentMeJid();
         if (meJid) {