@hbmodsofc/baileys 2.5.0 → 3.1.0

package/lib/Socket/index.js

@@ -1,11 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Defaults_1 = require("../Defaults");
-const registration_1 = require("./registration");
-// export the last socket layer
-const makeWASocket = (config) => ((0, registration_1.makeRegistrationSocket)({
-    ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
-    ...config
-}));
-exports.default = makeWASocket;
-exports.makeWASocket = makeWASocket;
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults");
+const communities_1 = require("./communities"); 
+global.__SOCKET_MAP__ = global.__SOCKET_MAP__ || new Map()
+
+/**
+ * * @param {Object} config - Konfigurasi Baileys
+ * @param {String} sessionId - ID Unik
+ */
+const makeWASocket = (config, sessionId = 'primary') => {
+  if (global.__SOCKET_MAP__.has(sessionId)) {
+    const oldSock = global.__SOCKET_MAP__.get(sessionId)
+    
+    try {
+      oldSock.ws?.close?.()
+      oldSock.ws?.terminate?.()
+      oldSock.ws?.removeAllListeners?.()
+      oldSock.ev?.removeAllListeners?.()
+    } catch (e) {
+    }
+    global.__SOCKET_MAP__.delete(sessionId)
+  }
+  // -----------------------------------
+
+  const sock = (0, communities_1.makeCommunitiesSocket)({
+        ...DEFAULT_CONNECTION_CONFIG,
+        ...config
+    });
+
+  global.__SOCKET_MAP__.set(sessionId, sock)
+  sock.ws.on('close', () => {
+      if (global.__SOCKET_MAP__.get(sessionId) === sock) {
+          global.__SOCKET_MAP__.delete(sessionId)
+      }
+  })
+
+  return sock
+}
+
+exports.default = makeWASocket

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("RexxHayanasi-DEBUG:", JSON.stringify({ ...child, content: Buffer.isBuffer(child.content) ? child.content.toString() : child.content, participant }, null, 2))
         }
     };
     const handleNewsletterNotification = (id, node) => {
@@ -803,10 +747,21 @@ const makeMessagesRecvSocket = (config) => {
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    var _a, _b, _c, _d, _e, _f;
-                    await decrypt();
-                    // message failed to decrypt
+                    var _a, _b, _c, _d, _e, _f;                  
+                    try {
+                        await decrypt();
+                    } catch (err) {
+                        const errStr = String(err);
+               if (errStr.includes('Bad MAC') || errStr.includes('Invalid MAC')) {
+                 logger.warn({ msgId: node.attrs.id, from: node.attrs.from }, '⚠️ Bad MAC detected (Node 20/24 issue) - Forcing Retry...');                         
+                            msg.messageStubType = WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT;
+                            msg.messageStubParameters = [Utils_1.MISSING_KEYS_ERROR_TEXT];
+                        } else {
+                            throw err;
+                        }
+                    }
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
+
                         if (((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.MISSING_KEYS_ERROR_TEXT) {
                             return sendMessageAck(node, Utils_1.NACK_REASONS.ParsingError);
                         }