@itsliaaa/baileys 0.1.19 → 0.1.21

package/README.md

@@ -3,17 +3,19 @@
 [![Logo](https://files.catbox.moe/c5s9g0.jpg)](https://www.npmjs.com/package/@itsliaaa/baileys)
 
 <p align="center">
+   Enhanced Baileys v7 with fixed newsletter media upload, plus support for interactive messages, albums, and more message types.
+   <br><br>
    <a href="https://www.npmjs.com/package/@itsliaaa/baileys">
-      <img src="https://img.shields.io/npm/v/@itsliaaa/baileys?color=FFFFFF&labelColor=red&logo=npm&logoColor=white&style=for-the-badge"/>
+      <img src="https://img.shields.io/npm/v/@itsliaaa/baileys?style=for-the-badge&logo=npm"/>
    </a>
    <a href="https://www.npmjs.com/package/@itsliaaa/baileys">
-      <img src="https://img.shields.io/npm/dm/@itsliaaa/baileys?color=FFFFFF&labelColor=red&logo=npm&logoColor=white&style=for-the-badge"/>
+      <img src="https://img.shields.io/npm/dm/@itsliaaa/baileys?style=for-the-badge&logo=npm"/>
    </a>
    <a href="https://github.com/itsliaaa/baileys">
-      <img src="https://img.shields.io/github/stars/itsliaaa/baileys?color=FFFFFF&labelColor=black&logo=github&logoColor=white&style=for-the-badge"/>
+      <img src="https://img.shields.io/github/stars/itsliaaa/baileys?style=for-the-badge&logo=github"/>
    </a>
    <a href="LICENSE">
-      <img src="https://img.shields.io/badge/license-MIT-blue?labelColor=black&style=for-the-badge"/>
+      <img src="https://img.shields.io/badge/license-MIT-blue?style=for-the-badge"/>
    </a>
    <a href="https://nodejs.org">
       <img src="https://img.shields.io/badge/node-%3E%3D20-339933?logo=node.js&labelColor=green&logoColor=white&style=for-the-badge"/>
@@ -23,11 +25,11 @@
    </a>
 </p>
 
-A lightweight fork of Baileys with practical fixes and small but meaningful improvements.
+☕ For donation: [Saweria](https://saweria.co/itsliaaa)
 
 ### ✨ Highlights
 
-This fork focuses on clarity and safety:
+This fork designed for production use with a focus on clarity and safety:
 
 - 🚫 No obfuscation. Easy to read and audit.
 - 🚫 No auto-follow channel (newsletter) behavior.
@@ -41,24 +43,25 @@ This fork focuses on clarity and safety:
 - 🗃️ Added [`@napi-rs/image`](https://www.npmjs.com/package/@napi-rs/image) as a supported image processing backend in [`getImageProcessingLibrary()`](#%EF%B8%8F-image-processing), offering a balance between performance and compatibility.
 
 #### 📨 Message Handling & Compatibility
-- 👉🏻 Added support for sending [interactive messages](#-sending-interactive-messages) (buttons, lists, interactive, templates, carousel).
+- 👉🏻 Added support for sending [interactive messages](#-sending-interactive-messages) (buttons, lists, interactive, template, carousel).
 - 📩 Expanded message support for:
-   - [album messages](#%EF%B8%8F-album-image--video)
-   - [group status messages](#4%EF%B8%8F⃣-group-status)
-   - [status mention messages](#%EF%B8%8F-status-mention)
-   - [sticker pack messages](#-sticker-pack)
-   - [messages with code blocks](#-message-with-code-block)
-   - [messages with tables](#-message-with-table)
-   - [payment-related messages](#-sending-payment-messages) (payment requests, invites, orders, invoices).
-- 📰 Simplified sending messages with ad thumbnails using [`externalAdReply`](#3%EF%B8%8F⃣-external-ad-reply), without requiring manual `contextInfo`.
+   - 🖼️ [Album Message](#%EF%B8%8F-album-image--video)
+   - 👤 [Group Status Message](#4%EF%B8%8F⃣-group-status)
+   - 🎞️ [Status Mention Message](#%EF%B8%8F-status-mention)
+   - 📦 [Sticker Pack Message](#-sticker-pack)
+   - ✨ [Rich Response Message](#-rich-response) **[NEW]**
+   - 🧾 [Message with Code Blocks](#-message-with-code-block) **[NEW]**
+   - 📋 [Message with Table](#-message-with-table) **[NEW]**
+   - 💳 [Payment-related Message](#-sending-payment-messages) (payment requests, invites, orders, invoices).
+- 📰 Simplified sending messages with ad thumbnail using [`externalAdReply`](#3%EF%B8%8F⃣-external-ad-reply), without requiring manual `contextInfo`.
 
 #### 🧩 Additional Message Options
 - 👁️ Added optional boolean flags for message handling:  
-   - [`ai`](#1%EF%B8%8F⃣-ai-label) - AI label on message
-   - [`mentionAll`](#-mention) - Mentions all group participants without requiring their JIDs in `mentions` or `mentionedJid`
-   - [`ephemeral`](#2%EF%B8%8F⃣-ephemeral), [`groupStatus`](#4%EF%B8%8F⃣-group-status), [`viewOnceV2`](#8%EF%B8%8F⃣-view-once-v2), [`viewOnceV2Extension`](#9%EF%B8%8F⃣-view-once-v2-extension), [`interactiveAsTemplate`](#3%EF%B8%8F⃣-interactive) - Message wrappers
-   - [`secureMetaServiceLabel`](#6%EF%B8%8F⃣-secure-meta-service-label) - Secure meta service label on message
-   - [`raw`](#5%EF%B8%8F⃣-raw) - Build your message manually **(DO NOT USE FOR EXPLOITATION)**
+   - 🤖 [`ai`](#1%EF%B8%8F⃣-ai-icon) - AI icon on message
+   - 📣 [`mentionAll`](#-mention) - Mention all group participants without requiring their JIDs in `mentions` or `mentionedJid` **[NEW]**
+   - 🔧 [`ephemeral`](#2%EF%B8%8F⃣-ephemeral), [`groupStatus`](#4%EF%B8%8F⃣-group-status), [`viewOnceV2`](#8%EF%B8%8F⃣-view-once-v2), [`viewOnceV2Extension`](#9%EF%B8%8F⃣-view-once-v2-extension), [`interactiveAsTemplate`](#3%EF%B8%8F⃣-interactive) - Message wrappers
+   - 🔒 [`secureMetaServiceLabel`](#6%EF%B8%8F⃣-secure-meta-service-label) - Secure meta service label on message **[NEW]**
+   - 📄 [`raw`](#5%EF%B8%8F⃣-raw) - Build your message manually **(DO NOT USE FOR EXPLOITATION)**
 
 > [!NOTE]
 📄 This project is maintained with limited scope and is not intended to replace upstream Baileys.
@@ -314,7 +317,7 @@ const vcard = 'BEGIN:VCARD\n'
 
 sock.sendMessage(jid, {
    contacts: {
-      displayName: 'Lia',
+      displayName: 'Lia Wynn',
       contacts: [
          { vcard }
       ]
@@ -405,6 +408,47 @@ sock.sendMessage([jidA, jidB, jidC], {
 })
 ```
 
+##### ✨ Rich Response
+
+> [!NOTE]
+`richResponse[]` is a representation of [`submessages[]`](https://baileys.wiki/docs/api/namespaces/proto/interfaces/IAIRichResponseSubMessage) inside `richResponseMessage`.
+
+> [!TIP]
+You can still use the original [`submessages[]`](https://baileys.wiki/docs/api/namespaces/proto/interfaces/IAIRichResponseSubMessage) field directly.
+> The code example below is just an implementation using a helper, not a required structure.
+
+```javascript
+sock.sendMessage(jid, {
+   richResponse: [{
+      text: 'Example Usage',
+   }, {
+      language: 'javascript',
+      code: [{
+         highlightType: 0,
+         codeContent: 'console.log("Hello, World!")'
+      }]
+   }, {
+      text: 'Pretty simple, right?\n'
+   }, {
+      text: 'Comparison between Node.js, Bun, and Deno',
+   }, {
+      title: 'Runtime Comparison',
+      table: [{
+         isHeading: true,
+         items: ['', 'Node.js', 'Bun', 'Deno']
+      }, {
+         isHeading: false,
+         items: ['Engine', 'V8 (C++)', 'JavaScriptCore (C++)', 'V8 (C++)']
+      }, {
+         isHeading: false,
+         items: ['Performance', '4/5', '5/5', '4/5']
+      }]
+   }, {
+      text: 'Does this help clarify the differences?'
+   }]
+})
+```
+
 ##### 🧾 Message with Code Block
 
 ```javascript
@@ -828,7 +872,7 @@ sock.sendMessage(jid, {
 
 #### 👁️ Other Message Options
 
-##### 1️⃣ AI Label
+##### 1️⃣ AI Icon
 
 > [!NOTE]
 It only works in private chat (`@s.whatsapp.net`).
@@ -838,7 +882,7 @@ sock.sendMessage(jid, {
    image: {
       url: './path/to/image.jpg'
    },
-   caption: '🤖 AI Labeled!',
+   caption: '🤖 With AI icon!',
    ai: true
 }, {
    quoted: message

package/lib/Socket/messages-send.js

@@ -28,36 +28,40 @@ export const makeMessagesSocket = (config) => {
     const messageRetryManager = enableRecentMessageCache ? new MessageRetryManager(logger, maxMsgRetryCount) : null;
     // Prevent race conditions in Signal session encryption by user
     const encryptionMutex = makeKeyedMutex();
+    // Prevent race conditions in media connection refresh
+    const mediaConnMutex = makeKeyedMutex();
     let mediaConn;
     const refreshMediaConn = async (forceGet = false) => {
-        const media = await mediaConn;
-        if (!media || forceGet || new Date().getTime() - media.fetchDate.getTime() > media.ttl * 1000) {
-            mediaConn = (async () => {
-                const result = await query({
-                    tag: 'iq',
-                    attrs: {
-                        type: 'set',
-                        xmlns: 'w:m',
-                        to: S_WHATSAPP_NET
-                    },
-                    content: [{ tag: 'media_conn', attrs: {} }]
-                });
-                const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
-                // TODO: explore full length of data that whatsapp provides
-                const node = {
-                    hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
-                        hostname: attrs.hostname,
-                        maxContentLengthBytes: +attrs.maxContentLengthBytes
-                    })),
-                    auth: mediaConnNode.attrs.auth,
-                    ttl: +mediaConnNode.attrs.ttl,
-                    fetchDate: new Date()
-                };
-                logger.debug('fetched media conn');
-                return node;
-            })();
-        }
-        return mediaConn;
+        return mediaConnMutex.mutex('media-conn', async () => {
+            const media = await mediaConn;
+            if (!media || forceGet || new Date().getTime() - media.fetchDate.getTime() > media.ttl * 1000) {
+                mediaConn = (async () => {
+                    const result = await query({
+                        tag: 'iq',
+                        attrs: {
+                            type: 'set',
+                            xmlns: 'w:m',
+                            to: S_WHATSAPP_NET
+                        },
+                        content: [{ tag: 'media_conn', attrs: {} }]
+                    });
+                    const mediaConnNode = getBinaryNodeChild(result, 'media_conn');
+                    // TODO: explore full length of data that whatsapp provides
+                    const node = {
+                        hosts: getBinaryNodeChildren(mediaConnNode, 'host').map(({ attrs }) => ({
+                            hostname: attrs.hostname,
+                            maxContentLengthBytes: +attrs.maxContentLengthBytes
+                        })),
+                        auth: mediaConnNode.attrs.auth,
+                        ttl: +mediaConnNode.attrs.ttl,
+                        fetchDate: new Date()
+                    };
+                    logger.debug('fetched media conn');
+                    return node;
+                })();
+            }
+            return mediaConn;
+        });
     };
     /**
      * generic send receipt function

package/lib/Utils/messages.js

@@ -10,7 +10,7 @@ import { isPnUser, isLidUser, isJidGroup, isJidNewsletter, isJidStatusBroadcast,
 import { sha256 } from './crypto.js';
 import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './generics.js';
 import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, getImageProcessingLibrary, getRawMediaUploadData, getStream, toBuffer } from './messages-media.js';
-import { generateRichCodeBlock, generateRichTable, wrapToBotForwardedMessage } from './rich-message-utils.js';
+import { prepareRichCodeBlock, prepareRichResponseMessage, prepareRichTable, wrapToBotForwardedMessage } from './rich-message-utils.js';
 import { shouldIncludeReportingToken } from './reporting-utils.js';
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
@@ -1020,10 +1020,13 @@ export const generateWAMessageContent = async (message, options) => {
     }
     // Lia@Changes 09-04-26 --- Add support for code block and table
     else if (hasNonNullishProperty(message, 'code')) {
-        m.richResponseMessage = generateRichCodeBlock(message);
+        m.richResponseMessage = prepareRichCodeBlock(message);
     }
     else if (hasNonNullishProperty(message, 'table')) {
-        m.richResponseMessage = generateRichTable(message);
+        m.richResponseMessage = prepareRichTable(message);
+    }
+    else if (hasNonNullishProperty(message, 'richResponse')) {
+        m.richResponseMessage = prepareRichResponseMessage(message.richResponse);
     }
     else {
         m = await prepareWAMessageMedia(message, options);

package/lib/Utils/rich-message-utils.js

@@ -1,9 +1,13 @@
 /**
  * Lia@Changes 09-04-26 [WIP]
- * Add support for tables and code blocks in richResponseMessage (wrapped in botForwardedMessage)
+ * Adds support for tables and code blocks with richResponseMessage (wrapped inside botForwardedMessage).
+ *
+ * If you use or copy this code, please credit my name or project.
  */
+import { randomUUID } from 'crypto';
 import { FORWARDED_AI_BOT_INFO, LEXER_REGEX } from '../Defaults/index.js';
-import { CodeHighlightType } from '../Types/RichType.js';
+import { CodeHighlightType, RichSubMessageType } from '../Types/RichType.js';
+const textEncoder = new TextEncoder();
 const CPP_KEYWORDS = new Set([
     'alignas', 'alignof', 'and', 'and_eq', 'asm', 'auto', 'bitand', 'bitor', 'bool', 'break', 'case',
     'catch', 'char', 'class', 'compl', 'concept', 'const', 'consteval', 'constexpr', 'constinit',
@@ -60,7 +64,7 @@ const RUST_KEYWORDS = new Set([
     'where', 'while', 'async', 'await', 'dyn', 'abstract', 'become', 'box', 'do', 'final',
     'macro', 'override', 'priv', 'typeof', 'unsized', 'virtual', 'yield'
 ]);
-const NOOP = new Set([])
+const NOOP = new Set([]);
 export const LANGUAGE_KEYWORDS = {
     css: CSS_KEYWORDS,
     html: HTML_KEYWORDS,
@@ -110,19 +114,47 @@ export const tokenizeCode = (code, language = 'javascript') => {
     }
     return blocks;
 };
-export const wrapToBotForwardedMessage = (message) =>
+// Lia@Changes 09-04-26 --- Inject buffer into unifiedResponse.data to support proper rendering of rich messages (ex: tables and code blocks)
+const toUnified = (submessages) =>
     ({
-        messageContextInfo: {
-            botMetadata: {
-                // Lia@Note 09-04-26 --- TODO: Fill verificationMetadata field
-                verificationMetadata: {},
-                botRenderingConfigMetadata: {}
+        response_id: randomUUID(),
+        sections: submessages.map((submessage) => {
+            switch (submessage.messageType) {
+                case RichSubMessageType.TEXT:
+                    return {
+                        view_model: {
+                            primitive: { text: submessage.messageText, inline_entities: [], __typename: 'GenAIMarkdownTextUXPrimitive' },
+                            __typename: 'GenAISingleLayoutViewModel'
+                        }
+                    };
+                case RichSubMessageType.TABLE:
+                    return {
+                        view_model: {
+                            primitive: {
+                                title: submessage.tableMetadata.title,
+                                rows: submessage.tableMetadata.rows.map((row) => ({ is_header: row.isHeading, cells: row.items })),
+                                __typename: 'GenATableUXPrimitive'
+                            },
+                            __typename: 'GenAISingleLayoutViewModel'
+                        }
+                    };
+                case RichSubMessageType.CODE:
+                    return {
+                        view_model: {
+                            primitive: {
+                                language: submessage.codeMetadata.codeLanguage,
+                                code_blocks: submessage.codeMetadata.codeBlocks.map((block) => ({ content: block.codeContent, type: CodeHighlightType[block.highlightType] })),
+                                __typename: 'GenAICodeUXPrimitive'
+                            },
+                            __typename: 'GenAISingleLayoutViewModel'
+                        }
+                    };
             }
-        },
-        botForwardedMessage: { message }
+            return submessage;
+        })
     });
-export const generateRichCodeBlock = ({ header, code, footer, language } = {}) => {
-    language ??= 'javascript'
+export const prepareRichCodeBlock = ({ header, code, footer, language } = {}) => {
+    language ??= 'javascript';
     const submessages = [];
     if (header) {
         submessages.push({
@@ -143,13 +175,17 @@ export const generateRichCodeBlock = ({ header, code, footer, language } = {}) =
             messageText: footer
         });
     }
-    return ({
+    const unified = toUnified(submessages);
+    return {
         submessages,
         messageType: 1,
+        unifiedResponse: {
+            data: textEncoder.encode(JSON.stringify(unified))
+        },
         contextInfo: FORWARDED_AI_BOT_INFO
-    });
+    };
 };
-export const generateRichTable = ({ header, title, table, footer } = {}) => {
+export const prepareRichTable = ({ header, title, table, footer } = {}) => {
     const tableRows = table.map((items, index) => ({
         isHeading: index == 0,
         items
@@ -174,9 +210,65 @@ export const generateRichTable = ({ header, title, table, footer } = {}) => {
             messageText: footer
         });
     }
-    return ({
+    const unified = toUnified(submessages);
+    return {
         submessages,
         messageType: 1,
+        unifiedResponse: {
+            data: textEncoder.encode(JSON.stringify(unified))
+        },
         contextInfo: FORWARDED_AI_BOT_INFO
+    };
+};
+export const prepareRichResponseMessage = (content) => {
+    const submessages = content.map((submessage) => {
+        if (submessage.text) {
+            return {
+                messageType: 2,
+                messageText: submessage.text
+            };
+        }
+        else if (submessage.code) {
+            return {
+                messageType: 5,
+                codeMetadata: {
+                    codeLanguage: submessage.language,
+                    codeBlocks: submessage.code
+                }
+            };
+        }
+        else if (submessage.table) {
+            return {
+                messageType: 4,
+                tableMetadata: {
+                    title: submessage.title,
+                    rows: submessage.table
+                }
+            };
+        }
+        return submessage;
     });
-};
+    const unified = toUnified(submessages);
+    return {
+        submessages,
+        messageType: 1,
+        unifiedResponse: {
+            data: textEncoder.encode(JSON.stringify(unified))
+        },
+        contextInfo: FORWARDED_AI_BOT_INFO
+    };
+}
+export const wrapToBotForwardedMessage = (message) =>
+    ({
+        messageContextInfo: {
+            botMetadata: {
+                // Lia@Note 09-04-26 --- TODO: Fill verificationMetadata field
+                verificationMetadata: {},
+                botRenderingConfigMetadata: {
+                    bloksVersioningId: '0903aa5f7f47de66789d5f4c86d3bd6e05e4bc3ff85e454a9f907d5ed7fef97c',
+                    pixelDensity: 2.75
+                }
+            }
+        },
+        botForwardedMessage: { message }
+    });

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@itsliaaa/baileys",
-   "version": "0.1.19",
-   "description": "A lightweight fork of Baileys with practical fixes and small but meaningful improvements.",
+   "version": "0.1.21",
+   "description": "Enhanced Baileys v7 with fixed newsletter media upload, plus support for interactive messages, albums, and more message types.",
    "main": "lib/index.js",
    "type": "module",
    "scripts": {
@@ -48,7 +48,7 @@
       "p-queue": "^9.1.0",
       "pino": "^9.6.0",
       "protobufjs": "^7.5.4",
-      "whatsapp-rust-bridge": "^0.5.3",
+      "whatsapp-rust-bridge": "0.5.3",
       "ws": "^8.19.0"
    },
    "peerDependencies": {