violetics 7.0.0-alpha → 7.0.2-alpha

package/lib/Socket/groups.js

@@ -1,27 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractGroupMetadata = exports.makeGroupsSocket = void 0;
-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 WAUSync_1 = require("../WAUSync"); 
-const makeGroupsSocket = (config) => {
-    const sock = (0, chats_1.makeChatsSocket)(config);
+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({
+    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 (0, exports.extractGroupMetadata)(result);
+        return extractGroupMetadata(result);
     };
     const groupFetchAllParticipating = async () => {
         const result = await query({
@@ -29,7 +25,7 @@ const makeGroupsSocket = (config) => {
             attrs: {
                 to: '@g.us',
                 xmlns: 'w:g2',
-                type: 'get',
+                type: 'get'
             },
             content: [
                 {
@@ -42,12 +38,12 @@ const makeGroupsSocket = (config) => {
                 }
             ]
         });
-        const data = {};
-        const groupsChild = (0, WABinary_1.getBinaryNodeChild)(result, 'groups');
+        const data = Object.create(null);
+        const groupsChild = getBinaryNodeChild(result, 'groups');
         if (groupsChild) {
-            const groups = (0, WABinary_1.getBinaryNodeChildren)(groupsChild, 'group');
+            const groups = getBinaryNodeChildren(groupsChild, 'group');
             for (const groupNode of groups) {
-                const meta = (0, exports.extractGroupMetadata)({
+                const meta = extractGroupMetadata({
                     tag: 'result',
                     attrs: {},
                     content: [groupNode]
@@ -55,11 +51,12 @@ const makeGroupsSocket = (config) => {
                 data[meta.id] = meta;
             }
         }
+        // TODO: properly parse LID / PN DATA
         sock.ev.emit('groups.update', Object.values(data));
         return data;
     };
     sock.ws.on('CB:ib,,dirty', async (node) => {
-        const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty');
+        const { attrs } = getBinaryNodeChild(node, 'dirty');
         if (attrs.type !== 'groups') {
             return;
         }
@@ -68,9 +65,10 @@ const makeGroupsSocket = (config) => {
     });
     return {
         ...sock,
+        extractGroupMetadata,
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = (0, Utils_1.generateMessageID)();
+            const key = generateMessageIDV2();
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -84,16 +82,14 @@ const makeGroupsSocket = (config) => {
                     }))
                 }
             ]);
-            return (0, exports.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 } }]
                 }
             ]);
         },
@@ -113,12 +109,13 @@ const makeGroupsSocket = (config) => {
                     attrs: {}
                 }
             ]);
-            const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_approval_requests');
-            const participants = (0, WABinary_1.getBinaryNodeChildren)(node, 'membership_approval_request');
+            const node = getBinaryNodeChild(result, 'membership_approval_requests');
+            const participants = 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: [
@@ -131,10 +128,11 @@ const makeGroupsSocket = (config) => {
                             }))
                         }
                     ]
-                }]);
-            const node = (0, WABinary_1.getBinaryNodeChild)(result, 'membership_requests_action');
-            const nodeAction = (0, WABinary_1.getBinaryNodeChild)(node, action);
-            const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(nodeAction, 'participant');
+                }
+            ]);
+            const node = getBinaryNodeChild(result, 'membership_requests_action');
+            const nodeAction = getBinaryNodeChild(node, action);
+            const participantsAffected = getBinaryNodeChildren(nodeAction, 'participant');
             return participantsAffected.map(p => {
                 return { status: p.attrs.error || '200', jid: p.attrs.jid };
             });
@@ -150,43 +148,52 @@ const makeGroupsSocket = (config) => {
                     }))
                 }
             ]);
-            const node = (0, WABinary_1.getBinaryNodeChild)(result, action);
-            const participantsAffected = (0, WABinary_1.getBinaryNodeChildren)(node, 'participant');
+            const node = getBinaryNodeChild(result, action);
+            const participantsAffected = getBinaryNodeChildren(node, 'participant');
             return participantsAffected.map(p => {
                 return { status: p.attrs.error || '200', jid: p.attrs.jid, content: p };
             });
         },
         groupUpdateDescription: async (jid, description) => {
-            var _a;
             const metadata = await groupMetadata(jid);
-            const prev = (_a = metadata.descId) !== null && _a !== void 0 ? _a : null;
+            const prev = metadata.descId ?? null;
             await groupQuery(jid, 'set', [
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: (0, Utils_1.generateMessageID)() } : { delete: 'true' }),
+                        ...(description ? { id: generateMessageIDV2() } : { 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 = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
-            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
+            const inviteNode = getBinaryNodeChild(result, 'invite');
+            return inviteNode?.attrs.code;
         },
         groupRevokeInvite: async (jid) => {
             const result = await groupQuery(jid, 'set', [{ tag: 'invite', attrs: {} }]);
-            const inviteNode = (0, WABinary_1.getBinaryNodeChild)(result, 'invite');
-            return inviteNode === null || inviteNode === void 0 ? void 0 : inviteNode.attrs.code;
+            const inviteNode = getBinaryNodeChild(result, 'invite');
+            return inviteNode?.attrs.code;
         },
         groupAcceptInvite: async (code) => {
             const results = await groupQuery('@g.us', 'set', [{ tag: 'invite', attrs: { code } }]);
-            const result = (0, WABinary_1.getBinaryNodeChild)(results, 'group');
-            return result === null || result === void 0 ? void 0 : result.attrs.jid;
+            const result = getBinaryNodeChild(results, 'group');
+            return result?.attrs.jid;
+        },
+        /**
+         * revoke a v4 invite for someone
+         * @param groupJid group jid
+         * @param invitedJid jid of person you invited
+         * @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;
         },
         /**
          * accept a GroupInviteMessage
@@ -195,19 +202,21 @@ const makeGroupsSocket = (config) => {
          */
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
             key = typeof key === 'string' ? { remoteJid: key } : key;
-            const results = await groupQuery(inviteMessage.groupJid, 'set', [{
+            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 = WAProto_1.proto.Message.GroupInviteMessage.fromObject(inviteMessage);
+                inviteMessage = proto.Message.GroupInviteMessage.fromObject(inviteMessage);
                 inviteMessage.inviteExpiration = 0;
                 inviteMessage.inviteCode = '';
                 ev.emit('messages.update', [
@@ -225,27 +234,25 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: (0, Utils_1.generateMessageID)(),
+                    id: generateMessageIDV2(sock.user?.id),
                     fromMe: false,
-                    participant: key.remoteJid,
+                    participant: key.remoteJid
                 },
-                messageStubType: Types_1.WAMessageStubType.GROUP_PARTICIPANT_ADD,
-                messageStubParameters: [
-                    authState.creds.me.id
-                ],
+                messageStubType: WAMessageStubType.GROUP_PARTICIPANT_ADD,
+                messageStubParameters: [JSON.stringify(authState.creds.me)],
                 participant: key.remoteJid,
-                messageTimestamp: (0, Utils_1.unixTimestampSeconds)()
+                messageTimestamp: unixTimestampSeconds()
             }, 'notify');
             return results.attrs.from;
         }),
         groupGetInviteInfo: async (code) => {
             const results = await groupQuery('@g.us', 'get', [{ tag: 'invite', attrs: { code } }]);
-            return (0, exports.extractGroupMetadata)(results);
+            return extractGroupMetadata(results);
         },
         groupToggleEphemeral: async (jid, ephemeralExpiration) => {
-            const content = ephemeralExpiration ?
-                { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } } :
-                { tag: 'not_ephemeral', attrs: {} };
+            const content = ephemeralExpiration
+                ? { tag: 'ephemeral', attrs: { expiration: ephemeralExpiration.toString() } }
+                : { tag: 'not_ephemeral', attrs: {} };
             await groupQuery(jid, 'set', [content]);
         },
         groupSettingUpdate: async (jid, setting) => {
@@ -255,63 +262,67 @@ const makeGroupsSocket = (config) => {
             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
+        groupFetchAllParticipating,
+        groupQuery
     };
 };
-exports.makeGroupsSocket = makeGroupsSocket;
-const extractGroupMetadata = (result) => {
-    var _a, _b;
-    const group = WABinary_1.getBinaryNodeChild(result, 'group');
-    const descChild = WABinary_1.getBinaryNodeChild(group, 'description');
+export const extractGroupMetadata = (result) => {
+    const group = getBinaryNodeChild(result, 'group');
+    const descChild = getBinaryNodeChild(group, 'description');
     let desc;
     let descId;
     let descOwner;
-    let descOwnerLid;
+    let descOwnerPn;
     let descTime;
     if (descChild) {
-        desc = WABinary_1.getBinaryNodeChildString(descChild, 'body');
-        descOwner = WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn || descChild.attrs.participant);
-        if (group.attrs.addressing_mode === 'lid') {
-            descOwnerLid = WABinary_1.jidNormalizedUser(descChild.attrs.participant);
-        }
+        desc = getBinaryNodeChildString(descChild, 'body');
+        descOwner = descChild.attrs.participant ? jidNormalizedUser(descChild.attrs.participant) : undefined;
+        descOwnerPn = descChild.attrs.participant_pn ? jidNormalizedUser(descChild.attrs.participant_pn) : undefined;
+        descTime = +descChild.attrs.t;
         descId = descChild.attrs.id;
-        descTime = descChild.attrs.t ? +descChild.attrs.t : undefined;
     }
-    const groupSize = group.attrs.size ? Number(group.attrs.size) : undefined;
-    const groupId = group.attrs.id.includes('@') ? group.attrs.id : (0, 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 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 metadata = {
         id: groupId,
-        addressingMode: group.attrs.addressing_mode,
+        notify: group.attrs.notify,
+        addressingMode: group.attrs.addressing_mode === 'lid' ? WAMessageAddressingMode.LID : WAMessageAddressingMode.PN,
         subject: group.attrs.subject,
-        subjectOwner: WABinary_1.jidNormalizedUser(group.attrs.s_o_pn || group.attrs.s_o),
-        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: WABinary_1.jidNormalizedUser(group.attrs.s_o) } : {}),
-        subjectTime: group.attrs.s_t ? +group.attrs.s_t : undefined,
-        size: groupSize || WABinary_1.getBinaryNodeChildren(group, 'participant').length,
-        creation: group.attrs.creation ? +group.attrs.creation : undefined,
-        owner: WABinary_1.jidNormalizedUser(group.attrs.creator_pn || group.attrs.creator),
-        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: WABinary_1.jidNormalizedUser(group.attrs.creator) } : {}),
+        subjectOwner: group.attrs.s_o,
+        subjectOwnerPn: group.attrs.s_o_pn,
+        subjectTime: +group.attrs.s_t,
+        size: group.attrs.size ? +group.attrs.size : 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,
+        owner_country_code: group.attrs.creator_country_code,
+        desc,
+        descId,
         descOwner,
-        descOwnerLid,
-        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'),
+        descOwnerPn,
+        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'),
         memberAddMode,
-        participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
+        participants: getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
+            // TODO: Store LID MAPPINGS
             return {
                 id: attrs.jid,
-                jid: attrs.phone_number || attrs.jid,
-                admin: (attrs.type || null),
+                phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
+                lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
+                admin: (attrs.type || null)
             };
         }),
         ephemeralDuration: eph ? +eph : undefined
     };
     return metadata;
-};
-exports.extractGroupMetadata = extractGroupMetadata;
-
+};

package/lib/Socket/index.js

@@ -1,11 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Defaults_1 = require("../Defaults");
-const registration_1 = require("./registration");
+import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
+import { makeCommunitiesSocket } from './communities.js';
 // export the last socket layer
-const makeWASocket = (config) => ((0, registration_1.makeRegistrationSocket)({
-    ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
-    ...config
-}));
-exports.default = makeWASocket;
-exports.makeWASocket = makeWASocket;
+const makeWASocket = (config) => {
+    const newConfig = {
+        ...DEFAULT_CONNECTION_CONFIG,
+        ...config
+    };
+    return makeCommunitiesSocket(newConfig);
+};
+export default makeWASocket;