zapo-js 0.1.1 → 0.2.0

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

@@ -1,21 +1,31 @@
+import { parseParticipants as parseGroupEventParticipants } from '../events/group.js';
 import { WA_DEFAULTS } from '../../protocol/defaults.js';
 import { WA_GROUP_PARTICIPANT_TYPES } from '../../protocol/group.js';
 import { WA_NODE_TAGS, WA_XMLNS } from '../../protocol/nodes.js';
 import { buildCreateGroupIq, buildGroupParticipantChangeIq, buildLeaveGroupIq } from '../../transport/node/builders/group.js';
-import { findNodeChild, getNodeChildren, getNodeChildrenByTag, hasNodeChild } from '../../transport/node/helpers.js';
+import { findNodeChild, getNodeChildrenByTagFromChildren, hasNodeChild } from '../../transport/node/helpers.js';
 import { assertIqResult, buildIqNode } from '../../transport/node/query.js';
 function parseGroupParticipants(node) {
-    const participantNodes = getNodeChildrenByTag(node, WA_NODE_TAGS.PARTICIPANT);
-    return participantNodes.map((p) => {
-        const type = p.attrs.type ?? WA_GROUP_PARTICIPANT_TYPES.REGULAR;
-        return {
-            jid: p.attrs.jid,
+    const parsed = parseGroupEventParticipants(node);
+    const participants = new Array(parsed.length);
+    let participantsCount = 0;
+    for (let index = 0; index < parsed.length; index += 1) {
+        const participant = parsed[index];
+        if (!participant.jid) {
+            continue;
+        }
+        const type = participant.role ?? WA_GROUP_PARTICIPANT_TYPES.REGULAR;
+        participants[participantsCount] = {
+            jid: participant.jid,
             type,
             isAdmin: type === WA_GROUP_PARTICIPANT_TYPES.ADMIN ||
                 type === WA_GROUP_PARTICIPANT_TYPES.SUPERADMIN,
             isSuperAdmin: type === WA_GROUP_PARTICIPANT_TYPES.SUPERADMIN
         };
-    });
+        participantsCount += 1;
+    }
+    participants.length = participantsCount;
+    return participants;
 }
 function parseGroupMetadata(node) {
     const groupNode = node.tag === WA_NODE_TAGS.GROUP ? node : findNodeChild(node, WA_NODE_TAGS.GROUP);
@@ -94,8 +104,12 @@ export function createGroupCoordinator(options) {
             ]);
             const result = await queryWithContext('group.list', node);
             assertIqResult(result, 'group.list');
-            const groupNodes = getNodeChildren(result).flatMap((child) => getNodeChildrenByTag(child, WA_NODE_TAGS.GROUP));
-            return groupNodes.map(parseGroupMetadata);
+            const groupNodes = getNodeChildrenByTagFromChildren(result, WA_NODE_TAGS.GROUP);
+            const metadata = new Array(groupNodes.length);
+            for (let index = 0; index < groupNodes.length; index += 1) {
+                metadata[index] = parseGroupMetadata(groupNodes[index]);
+            }
+            return metadata;
         },
         queryGroupInviteInfo: async (code) => {
             const node = buildIqNode('get', WA_DEFAULTS.GROUP_SERVER, WA_XMLNS.GROUPS, [

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

@@ -1,8 +1,8 @@
 import { createIncomingBaseEvent, createIncomingFailureHandler, createIncomingGroupNotificationHandler, createIncomingNotificationHandler, createIncomingReceiptHandler, createInfoBulletinNotificationEvent, createUnhandledIncomingNodeEvent } from '../incoming.js';
 import { WA_IQ_TYPES, WA_MESSAGE_TAGS, WA_NODE_TAGS, WA_NOTIFICATION_TYPES, WA_SIGNALING } from '../../protocol/constants.js';
 import { decodeNodeContentBase64OrBytes, findNodeChild, getNodeChildrenByTag } from '../../transport/node/helpers.js';
-import { parseOptionalInt, parseStreamControlNode, parseSuccessPersistAttributes } from '../../transport/stream/parse.js';
-import { toError } from '../../util/primitives.js';
+import { parseStreamControlNode, parseSuccessPersistAttributes } from '../../transport/stream/parse.js';
+import { parseOptionalInt, toError } from '../../util/primitives.js';
 const INFO_BULLETIN_NOTIFICATION_TYPES = new Set([
     'offline',
     'offline_preview',
@@ -77,14 +77,20 @@ export class WaIncomingNodeCoordinator {
         return true;
     }
     async dispatchIncomingNode(node) {
+        const handlersByTag = this.nodeHandlerRegistry.get(node.tag);
+        const nodeSubtype = node.attrs.type;
         if (node.tag === WA_MESSAGE_TAGS.RECEIPT) {
-            const handlers = this.getHandlersForNode(node);
-            for (const handler of handlers) {
-                if (await handler(node)) {
-                    if (!this.isRetryReceiptType(node.attrs.type)) {
-                        this.runtime.tryResolvePendingNode(node);
+            if (handlersByTag && handlersByTag.length > 0) {
+                for (const entry of handlersByTag) {
+                    if (entry.subtype !== undefined && entry.subtype !== nodeSubtype) {
+                        continue;
+                    }
+                    if (await entry.handler(node)) {
+                        if (!this.isRetryReceiptType(nodeSubtype)) {
+                            this.runtime.tryResolvePendingNode(node);
+                        }
+                        return true;
                     }
-                    return true;
                 }
             }
             return this.runtime.tryResolvePendingNode(node);
@@ -96,12 +102,14 @@ export class WaIncomingNodeCoordinator {
         if (genericHandled) {
             return true;
         }
-        const handlers = this.getHandlersForNode(node);
-        if (handlers.length === 0) {
+        if (!handlersByTag || handlersByTag.length === 0) {
             return false;
         }
-        for (const handler of handlers) {
-            if (await handler(node)) {
+        for (const entry of handlersByTag) {
+            if (entry.subtype !== undefined && entry.subtype !== nodeSubtype) {
+                continue;
+            }
+            if (await entry.handler(node)) {
                 return true;
             }
         }
@@ -110,21 +118,6 @@ export class WaIncomingNodeCoordinator {
     isRetryReceiptType(type) {
         return type === 'retry' || type === 'enc_rekey_retry';
     }
-    getHandlersForNode(node) {
-        const handlersByTag = this.nodeHandlerRegistry.get(node.tag);
-        if (!handlersByTag || handlersByTag.length === 0) {
-            return [];
-        }
-        const nodeSubtype = node.attrs.type;
-        const handlers = [];
-        for (const entry of handlersByTag) {
-            if (entry.subtype !== undefined && entry.subtype !== nodeSubtype) {
-                continue;
-            }
-            handlers.push(entry.handler);
-        }
-        return handlers;
-    }
     registerDefaultIncomingHandlers() {
         const runtime = this.runtime;
         this.registerIncomingHandler({
@@ -204,6 +197,7 @@ export class WaIncomingNodeCoordinator {
             handler: createIncomingFailureHandler({
                 logger: this.logger,
                 emitIncomingFailure: runtime.emitIncomingFailure,
+                stopComms: runtime.stopComms,
                 disconnect: runtime.disconnect,
                 clearStoredCredentials: runtime.clearStoredCredentials
             })