@areumtecnologia/baileys 1.0.5 → 1.1.0

package/handlers/baileys.js

@@ -1,4 +1,4 @@
-const wb = require('@whiskeysockets/baileys');
+// const wb = require('@whiskeysockets/baileys');
 const {
     Browsers,
     makeWASocket,
@@ -13,7 +13,7 @@ const {
 } = require('@itsukichan/baileys');
 
 module.exports = {
-    whiskeysocketsMakeWASocket: wb.makeWASocket,
+    // whiskeysocketsMakeWASocket: wb.makeWASocket,
     itsukichanMakeWASocket: makeWASocket,
     Browsers,
     decryptPollVote,

package/handlers/groups.js

@@ -48,13 +48,13 @@ class GroupHandler {
         this.client = client;
     }
 
-    /** Obtém os metadados de um grupo. */
+    /** Obtém os metadados de um grupo a partir da jid do grupo. */
     async getMetadata(groupId) {
         this.client._validateConnection();
         return this.client.sock.groupMetadata(groupId);
     }
 
-    /** Cria um novo grupo. */
+    /** Cria um novo grupo a partir de uma lista de jids. */
     async create(subject, participantsJids) {
         this.client._validateConnection();
         return this.client.sock.groupCreate(subject, participantsJids);

package/index.js

@@ -82,10 +82,11 @@ class Client extends EventEmitter {
         // =================================================================================================
         // Instancia os handlers, passando a si mesma (this) como referência.
         // Isso permite que os handlers acessem o 'sock' e outros métodos do cliente.
-        this.messages = new MessageHandler(this);
         this.groups = new GroupHandler(this);
         this.users = new UserHandler(this);
         this.calls = new CallHandler(this);
+        this.messages = new MessageHandler(this);
+
     }
 
     /**
@@ -97,42 +98,22 @@ class Client extends EventEmitter {
         this.status = ClientEvent.INIT;
         const { state, saveCreds } = await useMultiFileAuthState(this.sessionPath);
         const { version } = await fetchLatestBaileysVersion();
-        const credsPath = path.resolve(process.cwd(), this.sessionPath, "creds.json");
-        const creds = await this.fileExists(credsPath);
-        if (creds) {
-            // Conecta usando @itsukichan/baileys
-            this.sock = itsukichanMakeWASocket({
-                auth: state,
-                version,
-                browser: this.enviroment ? this.enviroment : Browsers.macOS("Desktop"),
-                logger: pino({ level: this.loggerLevel }),
-                markOnlineOnConnect: this.markOnlineOnConnect || false,
-                keepAliveIntervalMs: 15000,
-                cachedGroupMetadata: async (jid) => groupCache.get(jid),
-                getMessage: async (key) => {
-                    const chatId = key.remoteJid;
-                    const msg = this.store?.getMessage(chatId, key.id);
-                    // precisa retornar o raw.message
-                    return msg ? msg.raw?.message : undefined;
-                }
-            });
-        } else {
-            // Conecta usando Baileys
-            this.sock = whiskeysocketsMakeWASocket({
-                auth: state,
-                version,
-                browser: this.enviroment ? this.enviroment : Browsers.macOS("Desktop"),
-                logger: pino({ level: this.loggerLevel }),
-                markOnlineOnConnect: this.markOnlineOnConnect || false,
-                cachedGroupMetadata: async (jid) => groupCache.get(jid),
-                getMessage: async (key) => {
-                    const chatId = key.remoteJid;
-                    const msg = this.store?.getMessage(chatId, key.id);
-                    // precisa retornar o raw.message
-                    return msg ? msg.raw?.message : undefined;
-                }
-            });
-        }
+
+        this.sock = itsukichanMakeWASocket({
+            auth: state,
+            version,
+            browser: this.enviroment ? this.enviroment : Browsers.macOS("Desktop"),
+            logger: pino({ level: this.loggerLevel }),
+            markOnlineOnConnect: this.markOnlineOnConnect || false,
+            keepAliveIntervalMs: 15000,
+            cachedGroupMetadata: async (jid) => groupCache.get(jid),
+            getMessage: async (key) => {
+                const chatId = key.remoteJid;
+                const msg = this.store?.getMessage(chatId, key.id);
+                // precisa retornar o raw.message
+                return msg ? msg.raw?.message : undefined;
+            }
+        });
 
         // =================================================================================================
         //                                     EVENTO CENTRALIZADO DE CICLO DE VIDA

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@areumtecnologia/baileys",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "More baileys fork",
   "license": "ISC",
   "author": "Áreum Tecnologia",
@@ -10,8 +10,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@itsukichan/baileys": "^7.3.2",
-    "@whiskeysockets/baileys": "^7.0.0-rc.9",
+    "@itsukichan/baileys": "github:Itsukichann/Baileys#master",
     "crypto-digest-sync": "^1.0.0",
     "node-cache": "^5.1.2",
     "qrcode": "^1.5.4",

package/utils/message-normalizer.js

@@ -31,24 +31,32 @@ class MessageNormalizer {
         const type = this._getFriendlyType(rawMessage.message);
         const messageContent = rawMessage.message[originalType];
         const contextInfo = messageContent?.contextInfo;
-        const chatId = rawMessage.key.remoteJid.includes('@lid') ? rawMessage.key.remoteJidAlt?.replace(/:.*?@/, "@") : rawMessage.key.remoteJid;
-        const isGroup = chatId.endsWith('@g.us');
         const clientJid = client.jidNormalizedUser(client.sock.user.id);
-        const from = isGroup ? rawMessage.key.participant : rawMessage.key.fromMe ? clientJid : chatId;
-        const to = isGroup ? rawMessage.key.participant : rawMessage.key.fromMe ? chatId : clientJid;
+        const clientLid = client.sock.user.lid.replace(/:.*?@/, "@");
+        const fromMe = rawMessage.key.fromMe;
+        const chatLid = [rawMessage.key.remoteJid, rawMessage.key.remoteJidAlt].find(jid => jid && jid.includes('@lid'))?.replace(/:.*?@/, "@");
+        const chatId = [rawMessage.key.remoteJid, rawMessage.key.remoteJidAlt].find(jid => jid && !jid.includes('@lid'))?.replace(/:.*?@/, "@");
+        const isGroup = chatId.endsWith('@g.us');
+        const groupMetadata = isGroup ? await client.groups.getMetadata(chatId) : null;
+        const groupParticipants = groupMetadata?.participants;
+        const from = fromMe ? clientJid : chatId;
+        const to = fromMe ? chatId : clientJid;
+
         const normalized = {
             id: rawMessage.key.id,
-            from: from,
-            to: to,
-            chatId: chatId,
-            timestamp: new Date(Number(rawMessage.messageTimestamp) * 1000),
-            fromMe: rawMessage.key.fromMe,
-            isGroup: isGroup,
-            sender: {
-                id: from,
-                lid: rawMessage.key.remoteJid.includes('@lid') ? rawMessage.key.remoteJid : rawMessage.key.remoteJidAlt && rawMessage.key.remoteJidAlt.includes('@lid') ? rawMessage.key.remoteJidAlt : null,
-                pushName: rawMessage.pushName || ''
+            chat: {
+                id: chatId,
+                lid: from == to ? clientLid : chatLid,
+                isGroup,
+                groupMetadata,
+                groupPushName: groupMetadata?.subject || null,
+                groupParticipantSender: groupParticipants?.find(participant => fromMe && participant.id === clientJid || !fromMe && participant.id === [rawMessage.key.participant, rawMessage.key.participantAlt].find(jid => jid && !jid.includes('@lid'))?.replace(/:.*?@/, "@")) || null,
+                isBusiness: !!rawMessage.verifiedBizName,
             },
+            fromMe,
+            from,
+            fromPushName: fromMe ? client.user.name : isGroup ? groupMetadata?.subject : rawMessage.pushName,
+            to,
             type,
             body: this._extractBody(rawMessage.message),
             hasMedia: false,
@@ -66,6 +74,7 @@ class MessageNormalizer {
             reaction: this._extractReaction(rawMessage.message),
             pollUpdate: await this._extractPollUpdate(rawMessage, client),
             poll: this._extractPollCreation(rawMessage),
+            timestamp: new Date(Number(rawMessage.messageTimestamp) * 1000),
             raw: rawMessage // Referência ao objeto original para acesso avançado
         };
 
@@ -91,21 +100,6 @@ class MessageNormalizer {
 
     /** 
      * @private Retorna um tipo amigável baseado no conteúdo da mensagem. 
-     * 
-     * 
-     * {
-  "text": "This is an Interactive message!",
-  "title": "Hiii",
-  "subtitle": "There is a subtitle",
-  "footer": "Hello World!",
-  "interactiveButtons": [
-    {
-      "name": "cta_copy",
-      "buttonParamsJson": "{\"display_text\":\"Click Me!\",\"copy_code\":\"12345\"}"
-    }
-  ]
-}
-     * 
      */
     static _getFriendlyType(message) {
         if (!message) return 'unknown'
@@ -131,10 +125,10 @@ class MessageNormalizer {
         if (message.interactiveMessage && message.interactiveMessage.interactiveButtons && message.interactiveMessage.interactiveButtons[0].name === 'cta_call') return 'cta_call';
         if (message.interactiveMessage && message.interactiveMessage.interactiveButtons && message.interactiveMessage.interactiveButtons[0].name === 'voice_call') return 'voice_call';
 
-        if (message.interactiveMessage) return 'interactive_message';
-        if (message.interactiveMessage.interactiveButtons) return 'interactive_buttons';
-        if (message.interactiveMessage.interactiveList) return 'interactive_list';
+        if (message.interactiveMessage && message.interactiveMessage.interactiveButtons) return 'interactive_buttons';
+        if (message.interactiveMessage && message.interactiveMessage.interactiveList) return 'interactive_list';
 
+        if (message.interactiveMessage) return 'interactive_message';
 
         return 'unknown';
     }