cuki-bailx 1.2.4 → 1.2.6

package/lib/Socket/groups.js

@@ -6,7 +6,6 @@ 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);
     const { authState, ev, query, upsertMessage } = sock;
@@ -68,9 +67,10 @@ const makeGroupsSocket = (config) => {
     });
     return {
         ...sock,
+        groupQuery,
         groupMetadata,
         groupCreate: async (subject, participants) => {
-            const key = (0, Utils_1.generateMessageID)();
+            const key = (0, Utils_1.generateMessageIDV2)();
             const result = await groupQuery('@g.us', 'set', [
                 {
                     tag: 'create',
@@ -164,7 +164,7 @@ const makeGroupsSocket = (config) => {
                 {
                     tag: 'description',
                     attrs: {
-                        ...(description ? { id: (0, Utils_1.generateMessageID)() } : { delete: 'true' }),
+                        ...(description ? { id: (0, Utils_1.generateMessageIDV2)() } : { delete: 'true' }),
                         ...(prev ? { prev } : {})
                     },
                     content: description ? [
@@ -188,12 +188,23 @@ const makeGroupsSocket = (config) => {
             const result = (0, WABinary_1.getBinaryNodeChild)(results, 'group');
             return result === null || result === void 0 ? void 0 : 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
          * @param key the key of the invite message, or optionally only provide the jid of the person who sent the invite
          * @param inviteMessage the message to accept
          */
         groupAcceptInviteV4: ev.createBufferedFunction(async (key, inviteMessage) => {
+            var _a;
             key = typeof key === 'string' ? { remoteJid: key } : key;
             const results = await groupQuery(inviteMessage.groupJid, 'set', [{
                     tag: 'accept',
@@ -225,7 +236,7 @@ const makeGroupsSocket = (config) => {
             await upsertMessage({
                 key: {
                     remoteJid: inviteMessage.groupJid,
-                    id: (0, Utils_1.generateMessageID)(),
+                    id: (0, Utils_1.generateMessageIDV2)((_a = sock.user) === null || _a === void 0 ? void 0 : _a.id),
                     fromMe: false,
                     participant: key.remoteJid,
                 },
@@ -294,8 +305,12 @@ const extractGroupMetadata = (result) => {
         creation: group.attrs.creation ? +group.attrs.creation : undefined,
         owner: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn || group.attrs.creator),
         ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) } : {}),
+        desc,
+        descId,
         descOwner,
         descOwnerLid,
+        descTime,
+        linkedParent: ((_b = (0, WABinary_1.getBinaryNodeChild)(group, 'linked_parent')) === null || _b === void 0 ? void 0 : _b.attrs.jid) || undefined,
         restrict: !!(0, WABinary_1.getBinaryNodeChild)(group, 'locked'),
         announce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'announcement'),
         isCommunity: !!(0, WABinary_1.getBinaryNodeChild)(group, 'parent'),
@@ -306,6 +321,7 @@ const extractGroupMetadata = (result) => {
             return {
                 id: attrs.jid,
                 jid: attrs.phone_number || attrs.jid,
+                lid: attrs.lid || attrs.jid,
                 admin: (attrs.type || null),
             };
         }),
@@ -314,4 +330,3 @@ const extractGroupMetadata = (result) => {
     return metadata;
 };
 exports.extractGroupMetadata = extractGroupMetadata;
-

package/lib/Socket/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Defaults_1 = require("../Defaults");
-const registration_1 = require("./registration");
+const business_1 = require("./business");
 // export the last socket layer
-const makeWASocket = (config) => ((0, registration_1.makeRegistrationSocket)({
+const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
     ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
     ...config
 }));

package/lib/Socket/messages-recv.js

@@ -16,34 +16,9 @@ const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
 const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
-    const {
-        logger,
-        retryRequestDelayMs, 
-        maxMsgRetryCount,
-        getMessage, 
-        shouldIgnoreJid 
-    } = config;
+    const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const { 
-        ev,
-        authState, 
-        ws,
-        processingMutex,
-        signalRepository,
-        query,
-        upsertMessage,
-        resyncAppState,
-        groupMetadata,
-        onUnexpectedError, 
-        assertSessions,
-        sendNode,
-        relayMessage,
-        sendReceipt,
-        uploadPreKeys,
-        createParticipantNodes,
-        getUSyncDevices, 
-        sendPeerDataOperationMessage
-    } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, groupMetadata, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
     const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
@@ -67,7 +42,7 @@ const makeMessagesRecvSocket = (config) => {
                 to: attrs.from,
                 class: tag
             }
-        }
+        };
         if (!!errorCode) {
             stanza.attrs.error = errorCode.toString();
         }
@@ -83,31 +58,14 @@ const makeMessagesRecvSocket = (config) => {
         if (tag === 'message' && (0, WABinary_1.getBinaryNodeChild)({ tag, attrs, content }, 'unavailable')) {
             stanza.attrs.from = authState.creds.me.id;
         }
-        logger.debug({ 
-            recv: {
-                tag,
-                attrs 
-            },
-            sent: stanza.attrs }, 'sent ack');
+        logger.debug({ recv: { tag, attrs }, sent: stanza.attrs }, 'sent ack');
         await sendNode(stanza);
     };
     const offerCall = async (toJid, isVideo = false) => {
         const callId = (0, crypto_1.randomBytes)(16).toString('hex').toUpperCase().substring(0, 64);
         const offerContent = [];
-        offerContent.push({
-            tag: 'audio',
-            attrs: {
-                enc: 'opus',
-                rate: '16000'
-            }, content: undefined
-        });
-        offerContent.push({
-            tag: 'audio',
-            attrs: {
-                enc: 'opus',
-                rate: '8000' 
-            }, content: undefined 
-        });
+        offerContent.push({ tag: 'audio', attrs: { enc: 'opus', rate: '16000' }, content: undefined });
+        offerContent.push({ tag: 'audio', attrs: { enc: 'opus', rate: '8000' }, content: undefined });
         if (isVideo) {
             offerContent.push({
                 tag: 'video',
@@ -121,23 +79,9 @@ const makeMessagesRecvSocket = (config) => {
                 }
             });
         }
-        offerContent.push({
-            tag: 'net',
-            attrs: {
-                medium: '3'
-            },  content: undefined 
-        });
-        offerContent.push({ 
-            tag: 'capability',
-            attrs: {
-                ver: '1'
-            },  content: new Uint8Array([1, 4, 255, 131, 207, 4]) });
-        offerContent.push({
-            tag: 'encopt',
-            attrs: { 
-                keygen: '2'
-            },  content: undefined
-        })
+        offerContent.push({ tag: 'net', attrs: { medium: '3' }, content: undefined });
+        offerContent.push({ tag: 'capability', attrs: { ver: '1' }, content: new Uint8Array([1, 4, 255, 131, 207, 4]) });
+        offerContent.push({ tag: 'encopt', attrs: { keygen: '2' }, content: undefined });
         const encKey = (0, crypto_1.randomBytes)(32);
         const devices = (await getUSyncDevices([toJid], true, false)).map(({ user, device }) => (0, WABinary_1.jidEncode)(user, 's.whatsapp.net', device));
         await assertSessions(devices, true);
@@ -388,7 +332,7 @@ const makeMessagesRecvSocket = (config) => {
                 break;
                 break;
             default:
-            // console.log("BAILEYS-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
+            // console.log("VYZENBAIL-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
     };
     const handleNewsletterNotification = (id, node) => {