@pontalabs/baileys 1.0.6 → 1.0.7

package/lib/Socket/groups.js

@@ -1,32 +1,38 @@
-import { Boom } from '@hapi/boom';
-import { proto } from '../../WAProto/index.js';
-import { WAMessageAddressingMode, WAMessageStubType } from '../Types/index.js';
-import { generateMessageIDV2, unixTimestampSeconds } from '../Utils/index.js';
-import { getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString, isLidUser, isPnUser, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
-import { makeChatsSocket } from './chats.js';
-export const makeGroupsSocket = (config) => {
-    const sock = makeChatsSocket(config);
-    const { authState, ev, query, upsertMessage } = sock;
-    const groupQuery = async (jid, type, content) => query({
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const WAProto_1 = require("../../WAProto")
+const Types_1 = require("../Types")
+const Utils_1 = require("../Utils")
+const WABinary_1 = require("../WABinary")
+const chats_1 = require("./chats")
+
+const makeGroupsSocket = (config) => {
+    const sock = chats_1.makeChatsSocket(config)
+    const { authState, ev, query, upsertMessage } = sock
+    
+    const groupQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
             type,
             xmlns: 'w:g2',
-            to: jid
+            to: jid,
         },
         content
-    });
+    }))
+    
     const groupMetadata = async (jid) => {
-        const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
-        return extractGroupMetadata(result);
-    };
+        const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }])
+        return extractGroupMetadata(result)
+    }
+    
     const groupFetchAllParticipating = async () => {
         const result = await query({
             tag: 'iq',
             attrs: {
                 to: '@g.us',
                 xmlns: 'w:g2',
-                type: 'get'
+                type: 'get',
             },
             content: [
                 {
@@ -38,37 +44,44 @@ export const makeGroupsSocket = (config) => {
                     ]
                 }
             ]
-        });
-        const data = {};
-        const groupsChild = getBinaryNodeChild(result, 'groups');
+        })
+        
+        const data = {}
+        const groupsChild = WABinary_1.getBinaryNodeChild(result, 'groups')
+        
         if (groupsChild) {
-            const groups = getBinaryNodeChildren(groupsChild, 'group');
+            const groups = WABinary_1.getBinaryNodeChildren(groupsChild, 'group')
             for (const groupNode of groups) {
                 const meta = extractGroupMetadata({
                     tag: 'result',
                     attrs: {},
                     content: [groupNode]
-                });
-                data[meta.id] = meta;
+                })
+                data[meta.id] = meta
             }
         }
-        // TODO: properly parse LID / PN DATA
-        sock.ev.emit('groups.update', Object.values(data));
-        return data;
-    };
+        
+        sock.ev.emit('groups.update', Object.values(data))
+        return data
+    }
+    
     sock.ws.on('CB:ib,,dirty', async (node) => {
-        const { attrs } = getBinaryNodeChild(node, 'dirty');
+        const { attrs } = WABinary_1.getBinaryNodeChild(node, 'dirty')
         if (attrs.type !== 'groups') {
-            return;
+            return
         }
-        await groupFetchAllParticipating();
-        await sock.cleanDirtyBits('groups');
-    });
+                
+        await groupFetchAllParticipating()
+        await sock.cleanDirtyBits('groups')
+    })
+    
     return {
         ...sock,
+        groupQuery, 
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = generateMessageIDV2();
+            const key = Utils_1.generateMessageID()
+            
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -81,17 +94,20 @@ export const makeGroupsSocket = (config) => {
                         attrs: { jid }
                     }))
                 }
-            ]);
-            return extractGroupMetadata(result);
+            ])
+            
+            return extractGroupMetadata(result)
         },
         groupLeave: async (id) => {
             await groupQuery('@g.us', 'set', [
                 {
                     tag: 'leave',
                     attrs: {},
-                    content: [{ tag: 'group', attrs: { id } }]
+                    content: [
+                        { tag: 'group', attrs: { id } }
+                    ]
                 }
-            ]);
+            ])
         },
         groupUpdateSubject: async (jid, subject) => {
             await groupQuery(jid, 'set', [
@@ -100,7 +116,7 @@ export const makeGroupsSocket = (config) => {
                     attrs: {},
                     content: Buffer.from(subject, 'utf-8')
                 }
-            ]);
+            ])
         },
         groupRequestParticipantsList: async (jid) => {
             const result = await groupQuery(jid, 'get', [
@@ -108,14 +124,15 @@ export const makeGroupsSocket = (config) => {
                     tag: 'membership_approval_requests',
                     attrs: {}
                 }
-            ]);
-            const node = getBinaryNodeChild(result, 'membership_approval_requests');
-            const participants = getBinaryNodeChildren(node, 'membership_approval_request');
-            return participants.map(v => v.attrs);
+            ])
+            
+            const node = WABinary_1.getBinaryNodeChild(result, 'membership_approval_requests')
+            const participants = WABinary_1.getBinaryNodeChildren(node, 'membership_approval_request')
+            
+            return participants.map(v => v.attrs)
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
-            const result = await groupQuery(jid, 'set', [
-                {
+            const result = await groupQuery(jid, 'set', [{
                     tag: 'membership_requests_action',
                     attrs: {},
                     content: [
@@ -128,14 +145,15 @@ export const makeGroupsSocket = (config) => {
                             }))
                         }
                     ]
-                }
-            ]);
-            const node = getBinaryNodeChild(result, 'membership_requests_action');
-            const nodeAction = getBinaryNodeChild(node, action);
-            const participantsAffected = getBinaryNodeChildren(nodeAction, 'participant');
+                }])
+                
+            const node = WABinary_1.getBinaryNodeChild(result, 'membership_requests_action')
+            const nodeAction = WABinary_1.getBinaryNodeChild(node, action)
+            const participantsAffected = WABinary_1.getBinaryNodeChildren(nodeAction, 'participant')
+            
             return participantsAffected.map(p => {
-                return { status: p.attrs.error || '200', jid: p.attrs.jid };
-            });
+                return { status: p.attrs.error || '200', jid: p.attrs.jid }
+            })
         },
         groupParticipantsUpdate: async (jid, participants, action) => {
             const result = await groupQuery(jid, 'set', [
@@ -147,41 +165,48 @@ export const makeGroupsSocket = (config) => {
                         attrs: { jid }
                     }))
                 }
-            ]);
-            const node = getBinaryNodeChild(result, action);
-            const participantsAffected = getBinaryNodeChildren(node, 'participant');
+            ])
+            const node = WABinary_1.getBinaryNodeChild(result, action)
+            const participantsAffected = WABinary_1.getBinaryNodeChildren(node, 'participant')
+            
             return participantsAffected.map(p => {
-                return { status: p.attrs.error || '200', jid: p.attrs.jid, content: p };
-            });
+                return { status: p.attrs.error || '200', jid: p.attrs.jid, content: p }
+            })
         },
         groupUpdateDescription: async (jid, description) => {
-            const metadata = await groupMetadata(jid);
-            const prev = metadata.descId ?? null;
+            const metadata = await groupMetadata(jid)
+            const prev = metadata.descId ? metadata.descId : null
+            
             await groupQuery(jid, 'set', [
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: generateMessageIDV2() } : { delete: 'true' }),
+                        ...(description ? { id: Utils_1.generateMessageID() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
-                    content: description ? [{ tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }] : undefined
+                    content: description ? [
+                        { tag: 'body', attrs: {}, content: Buffer.from(description, 'utf-8') }
+                    ] : undefined
                 }
-            ]);
+            ])
         },
         groupInviteCode: async (jid) => {
-            const result = await groupQuery(jid, 'get', [{ tag: 'invite', attrs: {} }]);
-            const inviteNode = getBinaryNodeChild(result, 'invite');
-            return inviteNode?.attrs.code;
+            const result = await groupQuery(jid, 'get', [{ tag: 'invite', attrs: {} }])
+            const inviteNode = WABinary_1.getBinaryNodeChild(result, 'invite')
+            
+            return inviteNode?.attrs?.code
         },
         groupRevokeInvite: async (jid) => {
-            const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }]);
-            const inviteNode = getBinaryNodeChild(result, 'invite');
-            return inviteNode?.attrs.code;
+            const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }])
+            const inviteNode = WABinary_1.getBinaryNodeChild(result, 'invite')
+            
+            return inviteNode?.attrs?.code
         },
         groupAcceptInvite: async (code) => {
-            const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }]);
-            const result = getBinaryNodeChild(results, 'group');
-            return result?.attrs.jid;
+            const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }])
+            const result = WABinary_1.getBinaryNodeChild(results, 'group')
+            
+            return result?.attrs?.jid
         },
         /**
          * revoke a v4 invite for someone
@@ -190,10 +215,9 @@ export const makeGroupsSocket = (config) => {
          * @returns true if successful
          */
         groupRevokeInviteV4: async (groupJid, invitedJid) => {
-            const result = await groupQuery(groupJid, 'set', [
-                { tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }
-            ]);
-            return !!result;
+            const result = await groupQuery(groupJid, 'set', [{ tag: 'revoke', attrs: {}, content: [{ tag: 'participant', attrs: { jid: invitedJid } }] }])
+            
+            return !!result
         },
         /**
          * accept a GroupInviteMessage
@@ -201,24 +225,23 @@ export const makeGroupsSocket = (config) => {
          * @param inviteMessage the message to accept
          */
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
-            key = typeof key === 'string' ? { remoteJid: key } : key;
-            const results = await groupQuery(inviteMessage.groupJid, 'set', [
-                {
+            key = typeof key === 'string' ? { remoteJid: key } : key
+            const results = await groupQuery(inviteMessage.groupJid, 'set', [{
                     tag: 'accept',
                     attrs: {
                         code: inviteMessage.inviteCode,
                         expiration: inviteMessage.inviteExpiration.toString(),
                         admin: key.remoteJid
                     }
-                }
-            ]);
+                }])
+                
             // if we have the full message key
             // update the invite message to be expired
             if (key.id) {
                 // create new invite message that is expired
-                inviteMessage = proto.Message.GroupInviteMessage.fromObject(inviteMessage);
-                inviteMessage.inviteExpiration = 0;
-                inviteMessage.inviteCode = '';
+                inviteMessage = WAProto_1.proto.Message.GroupInviteMessage.fromObject(inviteMessage)
+                inviteMessage.inviteExpiration = 0
+                inviteMessage.inviteCode = ''
                 ev.emit('messages.update', [
                     {
                         key,
@@ -228,120 +251,118 @@ export const makeGroupsSocket = (config) => {
                             }
                         }
                     }
-                ]);
+                ])
             }
+            
             // generate the group add message
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: generateMessageIDV2(sock.user?.id),
+                    id: Utils_1.generateMessageID(authState.creds.me?.id), 
                     fromMe: false,
-                    participant: key.remoteJid
+                    participant: key.remoteJid,
                 },
-                messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [JSON.stringify(authState.creds.me)],
+                messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
+                messageStubParameters: [
+                    authState.creds.me.id
+                ],
                 participant: key.remoteJid,
-                messageTimestamp: unixTimestampSeconds()
-            }, 'notify');
-            return results.attrs.from;
+                messageTimestamp: Utils_1.unixTimestampSeconds()
+            }, 'notify')
+            
+            return results.attrs.from
         }),
         groupGetInviteInfo: async (code) => {
-            const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }]);
-            return extractGroupMetadata(results);
+            const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }])
+            
+            return extractGroupMetadata(results)
         },
         groupToggleEphemeral: async (jid, ephemeralExpiration) => {
-            const content = ephemeralExpiration
-                ? { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } }
-                : { tag: 'not_ephemeral', attrs: {} };
-            await groupQuery(jid, 'set', [content]);
+            const content = ephemeralExpiration ?
+                { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } } :
+                { tag: 'not_ephemeral', attrs: {} }
+            await groupQuery(jid, 'set', [content])
         },
         groupSettingUpdate: async (jid, setting) => {
-            await groupQuery(jid, 'set', [{ tag: setting, attrs: {} }]);
+            await groupQuery(jid, 'set', [{ tag: setting, attrs: {} }])
         },
         groupMemberAddMode: async (jid, mode) => {
-            await groupQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }]);
+            await groupQuery(jid, 'set', [{ tag: 'member_add_mode', attrs: {}, content: mode }])
         },
         groupJoinApprovalMode: async (jid, mode) => {
-            await groupQuery(jid, 'set', [
-                { tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }
-            ]);
+            await groupQuery(jid, 'set', [{ tag: 'membership_approval_mode', attrs: {}, content: [{ tag: 'group_join', attrs: { state: mode } }] }])
         },
         groupFetchAllParticipating
-    };
-};
-export const extractGroupMetadata = (result) => {
-    const group = getBinaryNodeChild(result, 'group');
-    if (!group) {
-        // Mirror WAWeb: surface server/client errors with their code+text instead of crashing.
-        const errorNode = getBinaryNodeChild(result, 'error');
-        if (errorNode) {
-            const code = errorNode.attrs.code ? +errorNode.attrs.code : 500;
-            const text = errorNode.attrs.text || 'group metadata query failed';
-            throw new Boom(text, { statusCode: code, data: errorNode });
-        }
-        throw new Boom('Invalid group metadata response: missing <group> node', { data: result });
     }
-    if (!group.attrs.id) {
-        throw new Boom('Invalid group metadata response: missing group id', { data: group });
-    }
-    const descChild = getBinaryNodeChild(group, 'description');
-    let desc;
-    let descId;
-    let descOwner;
-    let descOwnerPn;
-    let descOwnerUsername;
-    let descTime;
+}
+
+const extractGroupMetadata = (result) => {
+    const group = WABinary_1.getBinaryNodeChild(result, 'group')
+    const descChild = WABinary_1.getBinaryNodeChild(group, 'description')
+    const mode = group.attrs.addressing_mode === 'lid' ? Types_1.WAMessageAddressingMode.LID : Types_1.WAMessageAddressingMode.PN
+    
+    let desc
+    let descId
+    let descOwner
+    let descOwnerLid
+    
     if (descChild) {
-        desc = getBinaryNodeChildString(descChild, 'body');
-        descOwner = descChild.attrs.participant ? jidNormalizedUser(descChild.attrs.participant) : undefined;
-        descOwnerPn = descChild.attrs.participant_pn ? jidNormalizedUser(descChild.attrs.participant_pn) : undefined;
-        descOwnerUsername = descChild.attrs.participant_username || undefined;
-        descTime = +descChild.attrs.t;
-        descId = descChild.attrs.id;
+        desc = WABinary_1.getBinaryNodeChildString(descChild, 'body')
+        descId = descChild.attrs.id
+        descOwner = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn) : WABinary_1.jidNormalizedUser(descChild.attrs.participant) 
+        descOwnerLid = mode === Types_1.WAMessageAddressingMode.LID ? WABinary_1.jidNormalizedUser(descChild.attrs.participant) : undefined
     }
-    const groupId = group.attrs.id.includes('@') ? group.attrs.id : jidEncode(group.attrs.id, 'g.us');
-    const eph = getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration;
-    const memberAddMode = getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add';
+    
+    const groupId = group.attrs.id.includes('@') ? group.attrs.id : WABinary_1.jidEncode(group.attrs.id, 'g.us')
+    const eph = WABinary_1.getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration
+    const memberAddMode = WABinary_1.getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add'
+    
     const metadata = {
         id: groupId,
-        notify: group.attrs.notify,
-        addressingMode: group.attrs.addressing_mode === 'lid' ? WAMessageAddressingMode.LID : WAMessageAddressingMode.PN,
+        addressingMode: mode, 
         subject: group.attrs.subject,
-        subjectOwner: group.attrs.s_o,
-        subjectOwnerPn: group.attrs.s_o_pn,
-        subjectOwnerUsername: group.attrs.s_o_username,
+        subjectOwner: mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.s_o_pn : group.attrs.s_o,
+        subjectOwnerLid: group.attrs.s_o, 
         subjectTime: +group.attrs.s_t,
-        size: group.attrs.size ? +group.attrs.size : getBinaryNodeChildren(group, 'participant').length,
+        size: group.attrs?.size ? +group.attrs.size : WABinary_1.getBinaryNodeChildren(group, 'participant').length,
         creation: +group.attrs.creation,
-        owner: group.attrs.creator ? jidNormalizedUser(group.attrs.creator) : undefined,
-        ownerPn: group.attrs.creator_pn ? jidNormalizedUser(group.attrs.creator_pn) : undefined,
-        ownerUsername: group.attrs.creator_username || undefined,
-        owner_country_code: group.attrs.creator_country_code,
+        owner: group.attrs.creator ? WABinary_1.jidNormalizedUser(mode === Types_1.WAMessageAddressingMode.LID ? group.attrs.creator_pn : group.attrs.creator) : undefined,
+        ownerLid: group.attrs.creator ? WABinary_1.jidNormalizedUser(group.attrs.creator) : undefined, 
+        ownerCountry: group.attrs.creator_country_code, 
         desc,
         descId,
-        descOwner,
-        descOwnerPn,
-        descOwnerUsername,
-        descTime,
-        linkedParent: getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
-        restrict: !!getBinaryNodeChild(group, 'locked'),
-        announce: !!getBinaryNodeChild(group, 'announcement'),
-        isCommunity: !!getBinaryNodeChild(group, 'parent'),
-        isCommunityAnnounce: !!getBinaryNodeChild(group, 'default_sub_group'),
-        joinApprovalMode: !!getBinaryNodeChild(group, 'membership_approval_mode'),
+        descOwner, 
+        descOwnerLid, 
+        linkedParent: WABinary_1.getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
+        restrict: !!WABinary_1.getBinaryNodeChild(group, 'locked'),
+        announce: !!WABinary_1.getBinaryNodeChild(group, 'announcement'),
+        isCommunity: !!WABinary_1.getBinaryNodeChild(group, 'parent'),
+        isCommunityAnnounce: !!WABinary_1.getBinaryNodeChild(group, 'default_sub_group'),
+        joinApprovalMode: !!WABinary_1.getBinaryNodeChild(group, 'membership_approval_mode'),
         memberAddMode,
-        participants: getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
-            // TODO: Store LID MAPPINGS
+        participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
+            // FIX: sebelumnya id/lid cuma ngandelin `mode` (addressing mode
+            // grup secara keseluruhan), padahal atribut per-participant bisa
+            // aja beda. splitJidLid milah berdasarkan suffix domain aslinya,
+            // jadi hasilnya konsisten. phoneNumber ditambahin biar sejalan
+            // sama struktur participant di groups.js.
+            const primary = mode === Types_1.WAMessageAddressingMode.LID ? attrs.phone_number : attrs.jid
+            const alt = mode === Types_1.WAMessageAddressingMode.LID ? attrs.jid : attrs.lid
+            const { jid, lid } = WABinary_1.splitJidLid(primary, alt)
             return {
-                id: attrs.jid,
-                phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
-                lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
-                username: attrs.participant_username || attrs.username || undefined,
-                admin: (attrs.type || null)
-            };
+                id: jid || primary || attrs.jid,
+                lid,
+                phoneNumber: jid,
+                admin: (attrs.type || null),
+            }
         }),
-        ephemeralDuration: eph ? +eph : undefined
-    };
-    return metadata;
-};
-//# sourceMappingURL=groups.js.map
+        ephemeralDuration: eph ? +eph : undefined, 
+    }
+    
+    return metadata
+}
+
+module.exports = {
+  makeGroupsSocket, 
+  extractGroupMetadata
+}