zapo-js 0.1.1 → 0.2.0

package/dist/client/events/group.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseParticipants = parseParticipants;
 exports.parseGroupNotificationEvents = parseGroupNotificationEvents;
+const incoming_1 = require("../incoming");
 const constants_1 = require("../../protocol/constants");
 const nodes_1 = require("../../protocol/nodes");
 const helpers_1 = require("../../transport/node/helpers");
-const parse_1 = require("../../transport/stream/parse");
 const bytes_1 = require("../../util/bytes");
+const primitives_1 = require("../../util/primitives");
 function readNodeTextContent(node) {
     if (!node) {
         return undefined;
@@ -19,30 +21,42 @@ function readNodeTextContent(node) {
     return undefined;
 }
 function parseParticipants(node) {
-    return (0, helpers_1.getNodeChildrenByTag)(node, nodes_1.WA_NODE_TAGS.PARTICIPANT).map((participantNode) => ({
-        jid: participantNode.attrs.jid,
-        role: participantNode.attrs.type,
-        lidJid: participantNode.attrs.lid,
-        phoneJid: participantNode.attrs.phone_number,
-        displayName: participantNode.attrs.display_name,
-        username: participantNode.attrs.username,
-        expirationSeconds: (0, parse_1.parseOptionalInt)(participantNode.attrs.expiration)
-    }));
+    const participants = [];
+    for (const participantNode of (0, helpers_1.getNodeChildrenByTag)(node, nodes_1.WA_NODE_TAGS.PARTICIPANT)) {
+        participants.push({
+            jid: participantNode.attrs.jid,
+            role: participantNode.attrs.type,
+            lidJid: participantNode.attrs.lid,
+            phoneJid: participantNode.attrs.phone_number,
+            displayName: participantNode.attrs.display_name,
+            username: participantNode.attrs.username,
+            expirationSeconds: (0, primitives_1.parseOptionalInt)(participantNode.attrs.expiration)
+        });
+    }
+    return participants;
 }
 function parseLinkedGroups(node) {
-    return (0, helpers_1.getNodeChildrenByTag)(node, nodes_1.WA_NODE_TAGS.GROUP).map((groupNode) => ({
-        jid: groupNode.attrs.jid,
-        subject: groupNode.attrs.subject,
-        subjectTimestampSeconds: (0, parse_1.parseOptionalInt)(groupNode.attrs.s_t),
-        hiddenSubgroup: (0, helpers_1.findNodeChild)(groupNode, 'hidden_group') !== undefined
-    }));
+    const groups = [];
+    for (const groupNode of (0, helpers_1.getNodeChildrenByTag)(node, nodes_1.WA_NODE_TAGS.GROUP)) {
+        groups.push({
+            jid: groupNode.attrs.jid,
+            subject: groupNode.attrs.subject,
+            subjectTimestampSeconds: (0, primitives_1.parseOptionalInt)(groupNode.attrs.s_t),
+            hiddenSubgroup: (0, helpers_1.findNodeChild)(groupNode, 'hidden_group') !== undefined
+        });
+    }
+    return groups;
 }
 function parseMembershipRequests(node) {
-    return (0, helpers_1.getNodeChildrenByTag)(node, 'requested_user').map((requestNode) => ({
-        jid: requestNode.attrs.jid,
-        username: requestNode.attrs.username,
-        phoneJid: requestNode.attrs.phone_number
-    }));
+    const requests = [];
+    for (const requestNode of (0, helpers_1.getNodeChildrenByTag)(node, 'requested_user')) {
+        requests.push({
+            jid: requestNode.attrs.jid,
+            username: requestNode.attrs.username,
+            phoneJid: requestNode.attrs.phone_number
+        });
+    }
+    return requests;
 }
 function parseSubgroupSuggestion(node) {
     const subjectNode = (0, helpers_1.findNodeChild)(node, nodes_1.WA_NODE_TAGS.SUBJECT);
@@ -57,20 +71,26 @@ function parseSubgroupSuggestion(node) {
         ownerJid: node.attrs.creator,
         subject: readNodeTextContent(subjectNode),
         description: readNodeTextContent(descriptionBodyNode),
-        timestampSeconds: (0, parse_1.parseOptionalInt)(node.attrs.creation),
+        timestampSeconds: (0, primitives_1.parseOptionalInt)(node.attrs.creation),
         isExistingGroup: readNodeTextContent(isExistingGroupNode) === undefined
             ? undefined
             : readNodeTextContent(isExistingGroupNode) === 'true',
         participantCount: participantCountNode
-            ? (0, parse_1.parseOptionalInt)(readNodeTextContent(participantCountNode))
+            ? (0, primitives_1.parseOptionalInt)(readNodeTextContent(participantCountNode))
             : undefined,
         reason: node.attrs.reason
     };
 }
 function parseSubgroupSuggestions(node) {
-    return (0, helpers_1.getNodeChildrenByTag)(node, 'sub_group_suggestion')
-        .map(parseSubgroupSuggestion)
-        .filter((suggestion) => suggestion !== null);
+    const suggestions = [];
+    for (const suggestionNode of (0, helpers_1.getNodeChildrenByTag)(node, 'sub_group_suggestion')) {
+        const suggestion = parseSubgroupSuggestion(suggestionNode);
+        if (!suggestion) {
+            continue;
+        }
+        suggestions.push(suggestion);
+    }
+    return suggestions;
 }
 function createBaseGroupEvent(notificationNode, actionNode) {
     return {
@@ -81,16 +101,7 @@ function createBaseGroupEvent(notificationNode, actionNode) {
         stanzaType: notificationNode.attrs.type,
         groupJid: notificationNode.attrs.from,
         authorJid: notificationNode.attrs.participant,
-        timestampSeconds: (0, parse_1.parseOptionalInt)(notificationNode.attrs.t)
-    };
-}
-function createUnhandledStanzaEvent(notificationNode, reason) {
-    return {
-        rawNode: notificationNode,
-        stanzaId: notificationNode.attrs.id,
-        chatJid: notificationNode.attrs.from,
-        stanzaType: notificationNode.attrs.type,
-        reason
+        timestampSeconds: (0, primitives_1.parseOptionalInt)(notificationNode.attrs.t)
     };
 }
 function parseCreateGroupAction(notificationNode, actionNode) {
@@ -121,7 +132,7 @@ function parseCreateGroupAction(notificationNode, actionNode) {
             creatorPhoneJid: groupNode.attrs.creator_pn,
             creatorUsername: groupNode.attrs.creator_username,
             creatorCountryCode: groupNode.attrs.creator_country_code,
-            creationSeconds: (0, parse_1.parseOptionalInt)(groupNode.attrs.creation),
+            creationSeconds: (0, primitives_1.parseOptionalInt)(groupNode.attrs.creation),
             announceEnabled: (0, helpers_1.findNodeChild)(groupNode, nodes_1.WA_NODE_TAGS.ANNOUNCEMENT) !== undefined,
             restrictEnabled: (0, helpers_1.findNodeChild)(groupNode, nodes_1.WA_NODE_TAGS.LOCKED) !== undefined,
             noFrequentlyForwardedEnabled: (0, helpers_1.findNodeChild)(groupNode, constants_1.WA_GROUP_NOTIFICATION_TAGS.NO_FREQUENTLY_FORWARDED) !==
@@ -135,12 +146,11 @@ function parseCreateGroupAction(notificationNode, actionNode) {
             hasCapi: (0, helpers_1.findNodeChild)(groupNode, 'capi') !== undefined,
             limitSharingEnabled: (0, helpers_1.findNodeChild)(groupNode, constants_1.WA_GROUP_NOTIFICATION_TAGS.LIMIT_SHARING_ENABLED) !==
                 undefined,
-            size: (0, parse_1.parseOptionalInt)(groupNode.attrs.size),
-            ephemeralDuration: (0, parse_1.parseOptionalInt)((0, helpers_1.findNodeChild)(groupNode, nodes_1.WA_NODE_TAGS.EPHEMERAL)?.attrs.expiration),
+            size: (0, primitives_1.parseOptionalInt)(groupNode.attrs.size),
+            ephemeralDuration: (0, primitives_1.parseOptionalInt)((0, helpers_1.findNodeChild)(groupNode, nodes_1.WA_NODE_TAGS.EPHEMERAL)?.attrs.expiration),
             disappearingTrigger: (0, helpers_1.findNodeChild)(groupNode, nodes_1.WA_NODE_TAGS.EPHEMERAL)?.attrs.trigger,
             membershipApprovalEnabled: groupJoinNode?.attrs.state === 'on',
-            allowNonAdminSubGroupCreation: (0, helpers_1.findNodeChild)(groupNode, constants_1.WA_GROUP_NOTIFICATION_TAGS.ALLOW_NON_ADMIN_SUB_GROUP_CREATION) !==
-                undefined,
+            allowNonAdminSubGroupCreation: (0, helpers_1.findNodeChild)(groupNode, constants_1.WA_GROUP_NOTIFICATION_TAGS.ALLOW_NON_ADMIN_SUB_GROUP_CREATION) !== undefined,
             linkedParentGroupJid: (0, helpers_1.findNodeChild)(groupNode, 'linked_parent')?.attrs.jid ??
                 (0, helpers_1.findNodeChild)(groupNode, 'parent')?.attrs.jid
         }
@@ -212,7 +222,7 @@ function parseGroupActionNode(notificationNode, actionNode) {
                 details: {
                     subjectOwnerPhoneJid: actionNode.attrs.s_o_pn,
                     subjectOwnerUsername: actionNode.attrs.s_o_username,
-                    subjectTimestampSeconds: (0, parse_1.parseOptionalInt)(actionNode.attrs.s_t)
+                    subjectTimestampSeconds: (0, primitives_1.parseOptionalInt)(actionNode.attrs.s_t)
                 }
             };
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.DESCRIPTION: {
@@ -227,7 +237,12 @@ function parseGroupActionNode(notificationNode, actionNode) {
             };
         }
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.LOCKED:
-            return { ...baseEvent, action: 'restrict', enabled: true, mode: actionNode.attrs.threshold };
+            return {
+                ...baseEvent,
+                action: 'restrict',
+                enabled: true,
+                mode: actionNode.attrs.threshold
+            };
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.UNLOCKED:
             return { ...baseEvent, action: 'restrict', enabled: false };
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.ANNOUNCEMENT:
@@ -244,7 +259,7 @@ function parseGroupActionNode(notificationNode, actionNode) {
             return {
                 ...baseEvent,
                 action: 'ephemeral',
-                expirationSeconds: (0, parse_1.parseOptionalInt)(actionNode.attrs.expiration),
+                expirationSeconds: (0, primitives_1.parseOptionalInt)(actionNode.attrs.expiration),
                 mode: actionNode.attrs.trigger
             };
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.NOT_EPHEMERAL:
@@ -263,7 +278,7 @@ function parseGroupActionNode(notificationNode, actionNode) {
             return {
                 ...baseEvent,
                 action: 'growth_locked',
-                expirationSeconds: (0, parse_1.parseOptionalInt)(actionNode.attrs.expiration),
+                expirationSeconds: (0, primitives_1.parseOptionalInt)(actionNode.attrs.expiration),
                 mode: actionNode.attrs.type
             };
         case constants_1.WA_GROUP_NOTIFICATION_TAGS.GROWTH_UNLOCKED:
@@ -394,13 +409,13 @@ function parseGroupNotificationEvents(notificationNode) {
         try {
             const parsedEvent = parseGroupActionNode(notificationNode, actionNode);
             if (!parsedEvent) {
-                unhandled.push(createUnhandledStanzaEvent(notificationNode, `notification.${constants_1.WA_NOTIFICATION_TYPES.GROUP}.${actionNode.tag}.not_supported`));
+                unhandled.push((0, incoming_1.createUnhandledIncomingNodeEvent)(notificationNode, `notification.${constants_1.WA_NOTIFICATION_TYPES.GROUP}.${actionNode.tag}.not_supported`));
                 continue;
             }
             events.push(parsedEvent);
         }
         catch {
-            unhandled.push(createUnhandledStanzaEvent(notificationNode, `notification.${constants_1.WA_NOTIFICATION_TYPES.GROUP}.${actionNode.tag}.parse_failed`));
+            unhandled.push((0, incoming_1.createUnhandledIncomingNodeEvent)(notificationNode, `notification.${constants_1.WA_NOTIFICATION_TYPES.GROUP}.${actionNode.tag}.parse_failed`));
         }
     }
     return {

package/dist/client/events/identity.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseIdentityChangeNotification = parseIdentityChangeNotification;
+const helpers_1 = require("../../transport/node/helpers");
+function parseIdentityChangeNotification(node) {
+    const child = (0, helpers_1.getFirstNodeChild)(node);
+    if (!child || child.tag !== 'identity') {
+        return null;
+    }
+    const fromJid = node.attrs.from;
+    const stanzaId = node.attrs.id;
+    if (!fromJid || !stanzaId) {
+        return null;
+    }
+    return {
+        fromJid,
+        stanzaId,
+        displayName: node.attrs.display_name,
+        lid: node.attrs.lid,
+        offline: node.attrs.offline
+    };
+}

package/dist/client/events/privacy-token.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parsePrivacyTokenNotification = parsePrivacyTokenNotification;
+const privacy_token_1 = require("../../protocol/privacy-token");
+const helpers_1 = require("../../transport/node/helpers");
+const bytes_1 = require("../../util/bytes");
+const coercion_1 = require("../../util/coercion");
+function parsePrivacyTokenNotification(node) {
+    const tokensNode = (0, helpers_1.findNodeChild)(node, privacy_token_1.WA_PRIVACY_TOKEN_TAGS.TOKENS);
+    if (!tokensNode) {
+        return [];
+    }
+    const children = (0, helpers_1.getNodeChildren)(tokensNode);
+    const result = [];
+    for (let i = 0; i < children.length; i += 1) {
+        const child = children[i];
+        if (child.tag !== privacy_token_1.WA_PRIVACY_TOKEN_TAGS.TOKEN) {
+            continue;
+        }
+        const type = child.attrs.type;
+        if (!type) {
+            continue;
+        }
+        const rawTimestamp = child.attrs.t;
+        if (!rawTimestamp) {
+            continue;
+        }
+        const content = child.content;
+        if (!(content instanceof Uint8Array)) {
+            continue;
+        }
+        result[result.length] = {
+            type,
+            tokenBytes: (0, bytes_1.toBytesView)(content),
+            timestampS: (0, coercion_1.asNumber)(Number(rawTimestamp), 'privacy_token.t')
+        };
+    }
+    return result;
+}

package/dist/client/history-sync.js

@@ -4,7 +4,6 @@ exports.processHistorySyncNotification = processHistorySyncNotification;
 const node_util_1 = require("node:util");
 const node_zlib_1 = require("node:zlib");
 const _proto_1 = require("../proto.js");
-const base64_1 = require("../util/base64");
 const bytes_1 = require("../util/bytes");
 const primitives_1 = require("../util/primitives");
 const unzipAsync = (0, node_util_1.promisify)(node_zlib_1.unzip);
@@ -14,6 +13,7 @@ const HANDLED_SYNC_TYPES = new Set([
     _proto_1.proto.Message.HistorySyncType.FULL,
     _proto_1.proto.Message.HistorySyncType.PUSH_NAME
 ]);
+const HISTORY_SYNC_MAX_PENDING_WRITES = 1024;
 async function processHistorySyncNotification(deps, notification) {
     const syncType = notification.syncType;
     if (syncType === null || syncType === undefined || !HANDLED_SYNC_TYPES.has(syncType)) {
@@ -31,15 +31,85 @@ async function processHistorySyncNotification(deps, notification) {
         pushnames: historySync.pushnames.length
     });
     const nowMs = Date.now();
+    const pendingWrites = [];
+    for (const pn of historySync.pushnames) {
+        if (!pn.id) {
+            continue;
+        }
+        pendingWrites[pendingWrites.length] = deps.writeBehind.persistContactAsync({
+            jid: pn.id,
+            pushName: pn.pushname ?? undefined,
+            lastUpdatedMs: nowMs
+        });
+        if (pendingWrites.length >= HISTORY_SYNC_MAX_PENDING_WRITES) {
+            await flushPendingWrites(pendingWrites);
+        }
+    }
     let messagesCount = 0;
-    const conversationPromises = [];
     for (const conversation of historySync.conversations) {
-        conversationPromises.push(persistConversation(deps, conversation, nowMs).then((count) => {
-            messagesCount += count;
-        }));
+        const threadJid = conversation.id;
+        if (!threadJid) {
+            deps.logger.debug('skipping history sync conversation without thread jid');
+            continue;
+        }
+        pendingWrites[pendingWrites.length] = deps.writeBehind.persistThreadAsync({
+            jid: threadJid,
+            name: conversation.name ?? undefined,
+            unreadCount: conversation.unreadCount ?? undefined,
+            archived: conversation.archived ?? undefined,
+            pinned: conversation.pinned ?? undefined,
+            muteEndMs: (0, primitives_1.longToNumber)(conversation.muteEndTime) || undefined,
+            markedAsUnread: conversation.markedAsUnread ?? undefined,
+            ephemeralExpiration: conversation.ephemeralExpiration ?? undefined
+        });
+        if (pendingWrites.length >= HISTORY_SYNC_MAX_PENDING_WRITES) {
+            await flushPendingWrites(pendingWrites);
+        }
+        for (const histMsg of conversation.messages ?? []) {
+            const webMsg = histMsg.message;
+            if (!webMsg?.key?.id) {
+                continue;
+            }
+            const timestampMs = (0, primitives_1.longToNumber)(webMsg.messageTimestamp) * 1000;
+            pendingWrites[pendingWrites.length] = deps.writeBehind.persistMessageAsync({
+                id: webMsg.key.id,
+                threadJid,
+                senderJid: webMsg.key.participant ?? undefined,
+                fromMe: webMsg.key.fromMe === true,
+                timestampMs: timestampMs || undefined,
+                messageBytes: webMsg.message
+                    ? _proto_1.proto.Message.encode(webMsg.message).finish()
+                    : undefined
+            });
+            if (pendingWrites.length >= HISTORY_SYNC_MAX_PENDING_WRITES) {
+                await flushPendingWrites(pendingWrites);
+            }
+            messagesCount += 1;
+        }
+    }
+    if (deps.onPrivacyTokens) {
+        const tokenConversations = [];
+        for (const conversation of historySync.conversations) {
+            if (!conversation.id)
+                continue;
+            if (conversation.tcToken ||
+                conversation.tcTokenTimestamp ||
+                conversation.tcTokenSenderTimestamp) {
+                tokenConversations[tokenConversations.length] = {
+                    jid: conversation.id,
+                    tcToken: conversation.tcToken,
+                    tcTokenTimestamp: (0, primitives_1.longToNumber)(conversation.tcTokenTimestamp) || undefined,
+                    tcTokenSenderTimestamp: (0, primitives_1.longToNumber)(conversation.tcTokenSenderTimestamp) || undefined
+                };
+            }
+        }
+        if (tokenConversations.length > 0) {
+            pendingWrites[pendingWrites.length] = deps.onPrivacyTokens(tokenConversations);
+        }
+    }
+    if (deps.onNctSalt && historySync.nctSalt) {
+        pendingWrites[pendingWrites.length] = deps.onNctSalt(historySync.nctSalt);
     }
-    const pushnamePromise = persistPushnames(deps, historySync.pushnames, nowMs);
-    await Promise.all([...conversationPromises, pushnamePromise]);
     const event = {
         syncType,
         messagesCount,
@@ -48,18 +118,31 @@ async function processHistorySyncNotification(deps, notification) {
         chunkOrder: historySync.chunkOrder ?? undefined,
         progress: historySync.progress ?? undefined
     };
+    await flushPendingWrites(pendingWrites);
     deps.emitEvent('history_sync_chunk', event);
 }
+async function flushPendingWrites(pendingWrites) {
+    if (pendingWrites.length === 0) {
+        return;
+    }
+    const pendingCount = pendingWrites.length;
+    const batch = new Array(pendingCount);
+    for (let index = 0; index < pendingCount; index += 1) {
+        batch[index] = pendingWrites[index];
+    }
+    pendingWrites.length = 0;
+    await Promise.all(batch);
+}
 async function downloadHistorySyncBlob(deps, notification) {
     if (notification.initialHistBootstrapInlinePayload) {
-        return (0, base64_1.decodeProtoBytes)(notification.initialHistBootstrapInlinePayload, 'initialHistBootstrapInlinePayload');
+        return (0, bytes_1.decodeProtoBytes)(notification.initialHistBootstrapInlinePayload, 'initialHistBootstrapInlinePayload');
     }
     if (!notification.directPath) {
         throw new Error('history sync notification missing directPath');
     }
-    const mediaKey = (0, base64_1.decodeProtoBytes)(notification.mediaKey, 'history sync mediaKey');
-    const fileSha256 = (0, base64_1.decodeProtoBytes)(notification.fileSha256, 'history sync fileSha256');
-    const fileEncSha256 = (0, base64_1.decodeProtoBytes)(notification.fileEncSha256, 'history sync fileEncSha256');
+    const mediaKey = (0, bytes_1.decodeProtoBytes)(notification.mediaKey, 'history sync mediaKey');
+    const fileSha256 = (0, bytes_1.decodeProtoBytes)(notification.fileSha256, 'history sync fileSha256');
+    const fileEncSha256 = (0, bytes_1.decodeProtoBytes)(notification.fileEncSha256, 'history sync fileEncSha256');
     return deps.mediaTransfer.downloadAndDecrypt({
         directPath: notification.directPath,
         mediaType: 'history',
@@ -68,55 +151,3 @@ async function downloadHistorySyncBlob(deps, notification) {
         fileEncSha256
     });
 }
-async function persistConversation(deps, conversation, _nowMs) {
-    const threadJid = conversation.id;
-    if (!threadJid) {
-        deps.logger.debug('skipping history sync conversation without thread jid');
-        return 0;
-    }
-    const messages = conversation.messages ?? [];
-    const messageRecords = [];
-    for (const histMsg of messages) {
-        const webMsg = histMsg.message;
-        if (!webMsg?.key?.id) {
-            continue;
-        }
-        const timestampMs = (0, primitives_1.longToNumber)(webMsg.messageTimestamp) * 1000;
-        const messageBytes = webMsg.message
-            ? _proto_1.proto.Message.encode(webMsg.message).finish()
-            : undefined;
-        messageRecords.push({
-            id: webMsg.key.id,
-            threadJid,
-            senderJid: webMsg.key.participant ?? undefined,
-            fromMe: webMsg.key.fromMe === true,
-            timestampMs: timestampMs || undefined,
-            messageBytes
-        });
-    }
-    const threadPromise = deps.threadStore.upsert({
-        jid: threadJid,
-        name: conversation.name ?? undefined,
-        unreadCount: conversation.unreadCount ?? undefined,
-        archived: conversation.archived ?? undefined,
-        pinned: conversation.pinned ?? undefined,
-        muteEndMs: (0, primitives_1.longToNumber)(conversation.muteEndTime) || undefined,
-        markedAsUnread: conversation.markedAsUnread ?? undefined,
-        ephemeralExpiration: conversation.ephemeralExpiration ?? undefined
-    });
-    const messagePromises = messageRecords.map((record) => deps.messageStore.upsert(record));
-    await Promise.all([threadPromise, ...messagePromises]);
-    return messageRecords.length;
-}
-async function persistPushnames(deps, pushnames, nowMs) {
-    if (pushnames.length === 0) {
-        return;
-    }
-    await Promise.all(pushnames
-        .filter((pn) => !!pn.id)
-        .map((pn) => deps.contactStore.upsert({
-        jid: pn.id,
-        pushName: pn.pushname ?? undefined,
-        lastUpdatedMs: nowMs
-    })));
-}

package/dist/client/incoming.js

@@ -9,11 +9,17 @@ exports.createInfoBulletinNotificationEvent = createInfoBulletinNotificationEven
 exports.createUnhandledIncomingNodeEvent = createUnhandledIncomingNodeEvent;
 const group_1 = require("./events/group");
 const constants_1 = require("../protocol/constants");
-const message_1 = require("../transport/node/builders/message");
-const pairing_1 = require("../transport/node/builders/pairing");
+const global_1 = require("../transport/node/builders/global");
 const helpers_1 = require("../transport/node/helpers");
-const parse_1 = require("../transport/stream/parse");
 const primitives_1 = require("../util/primitives");
+const FAILURE_REASON_TO_DISCONNECT = {
+    401: constants_1.WA_DISCONNECT_REASONS.FAILURE_NOT_AUTHORIZED,
+    403: constants_1.WA_DISCONNECT_REASONS.FAILURE_LOCKED,
+    406: constants_1.WA_DISCONNECT_REASONS.FAILURE_BANNED,
+    405: constants_1.WA_DISCONNECT_REASONS.FAILURE_CLIENT_TOO_OLD,
+    409: constants_1.WA_DISCONNECT_REASONS.FAILURE_BAD_USER_AGENT,
+    503: constants_1.WA_DISCONNECT_REASONS.FAILURE_SERVICE_UNAVAILABLE
+};
 const LOGOUT_FAILURE_REASONS = new Set([401, 403, 406]);
 const DISCONNECT_FAILURE_REASONS = new Set([405, 409, 503]);
 const CORE_NOTIFICATION_TYPES = new Set([
@@ -40,6 +46,8 @@ const OUT_OF_SCOPE_NOTIFICATION_TYPES = new Set([
     'waffle',
     'hosted'
 ]);
+const NOTIFICATION_TYPES_WITH_PARTICIPANT_ACK = new Set(['mediaretry', 'psa']);
+const NOTIFICATION_TYPES_WITHOUT_TYPE_ACK = new Set(['encrypt', 'devices']);
 function createIncomingBaseEvent(node) {
     return {
         rawNode: node,
@@ -73,7 +81,9 @@ function classifyNotificationType(notificationType) {
 }
 async function applyFailureAction(options, reason, clearStoredCredentials) {
     try {
-        await options.disconnect();
+        options.stopComms();
+        const disconnectReason = FAILURE_REASON_TO_DISCONNECT[reason] ?? constants_1.WA_DISCONNECT_REASONS.STREAM_ERROR_OTHER;
+        await options.disconnect(disconnectReason, clearStoredCredentials, reason);
         if (clearStoredCredentials) {
             await options.clearStoredCredentials();
         }
@@ -118,18 +128,26 @@ function createIncomingReceiptHandler(options) {
                 await options.handleIncomingRetryReceipt(node);
             }
             else {
-                await sendSafeAck(options.logger, options.sendNode, (0, message_1.buildInboundRetryReceiptAckNode)(node));
+                await sendSafeAck(options.logger, options.sendNode, (0, global_1.buildAckNode)({
+                    kind: 'receipt',
+                    node,
+                    retryType: true
+                }));
             }
             return true;
         }
-        await sendSafeAck(options.logger, options.sendNode, (0, message_1.buildInboundReceiptAckNode)(node));
+        await sendSafeAck(options.logger, options.sendNode, (0, global_1.buildAckNode)({
+            kind: 'receipt',
+            node,
+            includeParticipant: receiptType !== 'server-error'
+        }));
         return true;
     };
 }
 function createIncomingFailureHandler(options) {
     return async (node) => {
-        const reason = (0, parse_1.parseOptionalInt)(node.attrs.reason);
-        const code = (0, parse_1.parseOptionalInt)(node.attrs.code);
+        const reason = (0, primitives_1.parseOptionalInt)(node.attrs.reason);
+        const code = (0, primitives_1.parseOptionalInt)(node.attrs.code);
         options.emitIncomingFailure({
             ...createIncomingBaseEvent(node),
             failureReason: reason,
@@ -148,49 +166,59 @@ function createIncomingFailureHandler(options) {
 function createIncomingNotificationHandler(options) {
     return async (node) => {
         const notificationType = node.attrs.type ?? '';
+        const includeParticipantInAck = NOTIFICATION_TYPES_WITH_PARTICIPANT_ACK.has(notificationType);
+        const includeTypeInAck = !NOTIFICATION_TYPES_WITHOUT_TYPE_ACK.has(notificationType);
         const classification = classifyNotificationType(notificationType);
         const firstChildTag = (0, helpers_1.getFirstNodeChild)(node)?.tag;
+        const baseEvent = createIncomingBaseEvent(node);
         const serverSyncCollections = notificationType === 'server_sync'
-            ? (0, helpers_1.getNodeChildrenByTag)(node, constants_1.WA_NODE_TAGS.COLLECTION)
-                .map((collectionNode) => collectionNode.attrs.name)
-                .filter((name) => typeof name === 'string' && name.length > 0)
+            ? (0, helpers_1.getNodeChildrenNonEmptyAttrValuesByTag)(node, constants_1.WA_NODE_TAGS.COLLECTION, 'name')
             : [];
+        let details;
+        if (firstChildTag || serverSyncCollections.length > 0) {
+            details = {};
+            if (firstChildTag) {
+                details.firstChildTag = firstChildTag;
+            }
+            if (serverSyncCollections.length > 0) {
+                details.collections = serverSyncCollections;
+            }
+        }
         options.emitIncomingNotification({
-            ...createIncomingBaseEvent(node),
+            ...baseEvent,
             notificationType,
             classification,
-            details: firstChildTag || serverSyncCollections.length > 0
-                ? {
-                    ...(firstChildTag ? { firstChildTag } : {}),
-                    ...(serverSyncCollections.length > 0
-                        ? { collections: serverSyncCollections }
-                        : {})
-                }
-                : undefined
+            details
         });
         if (classification === 'out_of_scope') {
             options.emitUnhandledStanza({
-                ...createIncomingBaseEvent(node),
+                ...baseEvent,
                 reason: `notification.${notificationType}.out_of_scope`
             });
         }
         else if (classification === 'unknown') {
             options.emitUnhandledStanza({
-                ...createIncomingBaseEvent(node),
+                ...baseEvent,
                 reason: `notification.${notificationType || 'unknown'}.not_supported`
             });
         }
-        await sendSafeAck(options.logger, options.sendNode, (0, pairing_1.buildNotificationAckNode)(node));
+        await sendSafeAck(options.logger, options.sendNode, (0, global_1.buildAckNode)({
+            kind: 'notification',
+            node,
+            includeParticipant: includeParticipantInAck,
+            includeType: includeTypeInAck
+        }));
         if (notificationType === 'server_sync' && serverSyncCollections.length > 0) {
+            const collectionsCsv = serverSyncCollections.join(',');
             if (!options.syncAppState) {
                 options.logger.warn('received server_sync notification without app-state sync runtime', {
-                    collections: serverSyncCollections.join(',')
+                    collections: collectionsCsv
                 });
                 return true;
             }
             void options.syncAppState().catch((error) => {
                 options.logger.warn('failed to sync app-state after server_sync notification', {
-                    collections: serverSyncCollections.join(','),
+                    collections: collectionsCsv,
                     message: (0, primitives_1.toError)(error).message
                 });
             });
@@ -203,6 +231,7 @@ function createIncomingGroupNotificationHandler(options) {
         if (node.attrs.type !== constants_1.WA_NOTIFICATION_TYPES.GROUP) {
             return false;
         }
+        const baseEvent = createIncomingBaseEvent(node);
         const parsed = (0, group_1.parseGroupNotificationEvents)(node);
         for (const event of parsed.events) {
             options.emitGroupEvent(event);
@@ -212,11 +241,15 @@ function createIncomingGroupNotificationHandler(options) {
         }
         if (parsed.events.length === 0 && parsed.unhandled.length === 0) {
             options.emitUnhandledStanza({
-                ...createIncomingBaseEvent(node),
+                ...baseEvent,
                 reason: `notification.${constants_1.WA_NOTIFICATION_TYPES.GROUP}.empty`
             });
         }
-        await sendSafeAck(options.logger, options.sendNode, (0, pairing_1.buildNotificationAckNode)(node));
+        await sendSafeAck(options.logger, options.sendNode, (0, global_1.buildAckNode)({
+            kind: 'notification',
+            node,
+            includeParticipant: true
+        }));
         return true;
     };
 }