@itsliaaa/baileys 0.1.23 → 0.1.24

package/README.md

@@ -453,10 +453,11 @@ sock.sendMessage(jid, {
 
 ```javascript
 sock.sendMessage(jid, {
-   header: 'Example Usage',
+   headerText: '## Example Usage',
+   contentText: '---'
    code: 'console.log("Hello, World!")',
-   footer: 'Pretty simple, right?',
-   language: 'javascript'
+   language: 'javascript',
+   footerText: 'Pretty simple, right?'
 })
 ```
 
@@ -464,14 +465,15 @@ sock.sendMessage(jid, {
 
 ```javascript
 sock.sendMessage(jid, {
-   header: 'Comparison between Node.js, Bun, and Deno',
+   headerText: '## Comparison between Node.js, Bun, and Deno',
+   contentText: '---',
    title: 'Runtime Comparison',
    table: [
       ['', 'Node.js', 'Bun', 'Deno'],
       ['Engine', 'V8 (C++)', 'JavaScriptCore (C++)', 'V8 (C++)'],
       ['Performance', '4/5', '5/5', '4/5']
    ],
-   footer: 'Does this help clarify the differences?'
+   footerText: 'Does this help clarify the differences?'
 })
 ```
 

package/lib/Defaults/index.js

@@ -145,10 +145,4 @@ export const TimeMs = {
 export const BOT_RENDERING_CONFIG_METADATA = {
     bloksVersioningId: '0903aa5f7f47de66789d5f4c86d3bd6e05e4bc3ff85e454a9f907d5ed7fef97c',
     pixelDensity: 2.75
-};
-export const FORWARDED_AI_BOT_INFO = {
-    isForwarded: true,
-    forwardingScore: 1,
-    forwardedAiBotMessageInfo: { botJid: '867051314767696@bot' },
-    forwardOrigin: 4
 };

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 { prepareRichCodeBlock, prepareRichLatex, prepareRichReels, prepareRichResponseMessage, prepareRichTable, wrapToBotForwardedMessage } from './rich-message-utils.js';
+import { prepareRichResponseMessage } from './rich-message-utils.js';
 import { shouldIncludeReportingToken } from './reporting-utils.js';
 const MIMETYPE_MAP = {
     image: 'image/jpeg',
@@ -695,6 +695,14 @@ export const generateWAMessageContent = async (message, options) => {
         delete message.raw;
         return message;
     }
+    // Lia@Changes 09-04-26 --- Add support for code block, latex, reels carousel, table with richResponseMessage
+    else if (hasNonNullishProperty(message, 'code') ||
+        hasNonNullishProperty(message, 'expressions') ||
+        hasNonNullishProperty(message, 'items') ||
+        hasNonNullishProperty(message, 'table') ||
+        hasNonNullishProperty(message, 'richResponse')) {
+        m = prepareRichResponseMessage(message);
+    }
     else if (hasNonNullishProperty(message, 'text')) {
         const extContent = { text: message.text };
         let urlInfo = message.linkPreview;
@@ -1018,22 +1026,6 @@ export const generateWAMessageContent = async (message, options) => {
             expectedVideoCount: videoCount
         };
     }
-    // Lia@Changes 09-04-26 --- Add support for code block, latex, reels carousel, table with richResponseMessage
-    else if (hasNonNullishProperty(message, 'code')) {
-        m.richResponseMessage = prepareRichCodeBlock(message);
-    }
-    else if (hasNonNullishProperty(message, 'expressions')) {
-        m.richResponseMessage = prepareRichLatex(message);
-    }
-    else if (hasNonNullishProperty(message, 'items')) {
-        m.richResponseMessage = prepareRichReels(message);
-    }
-    else if (hasNonNullishProperty(message, 'table')) {
-        m.richResponseMessage = prepareRichTable(message);
-    }
-    else if (hasNonNullishProperty(message, 'richResponse')) {
-        m.richResponseMessage = prepareRichResponseMessage(message.richResponse);
-    }
     else {
         m = await prepareWAMessageMedia(message, options);
     }
@@ -1425,10 +1417,6 @@ export const generateWAMessageContent = async (message, options) => {
         m = { viewOnceMessageV2Extension: { message: m } };
         delete message.viewOnceV2Extension;
     }
-    // Lia@Note 09-04-26 --- Wrap richResponseMessage into botForwardedMessage
-    if (!!m.richResponseMessage) {
-        m = wrapToBotForwardedMessage(m)
-    }
     if (hasOptionalProperty(message, 'edit')) {
         m = {
             protocolMessage: {

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

@@ -4,11 +4,12 @@
  *
  * If you use or copy this code, please credit my name or project.
  */
-import { randomUUID } from 'crypto';
-import { BOT_RENDERING_CONFIG_METADATA, FORWARDED_AI_BOT_INFO, LEXER_REGEX } from '../Defaults/index.js';
+import { getRandomValues, randomUUID, randomBytes } from 'crypto';
+import { BOT_RENDERING_CONFIG_METADATA, LEXER_REGEX } from '../Defaults/index.js';
 import { LANGUAGE_KEYWORDS } from '../WABinary/constants.js';
 import { CodeHighlightType, RichSubMessageType } from '../Types/RichType.js';
 import { proto } from '../../WAProto/index.js';
+import { unixTimestampSeconds } from './generics.js';
 const textEncoder = new TextEncoder();
 const NOOP = new Set([]);
 export const tokenizeCode = (code, language = 'javascript') => {
@@ -51,16 +52,18 @@ export const toUnified = (submessages) =>
         sections: submessages.map((submessage) => {
             switch (submessage.messageType) {
                 case RichSubMessageType.CODE:
+                    const codeMetadata = submessage.codeMetadata;
                     return {
                         view_model: {
                             primitive: {
-                                language: submessage.codeMetadata.codeLanguage,
-                                code_blocks: submessage.codeMetadata.codeBlocks.map((block) => ({ content: block.codeContent, type: CodeHighlightType[block.highlightType] })),
+                                language: codeMetadata.codeLanguage,
+                                code_blocks: codeMetadata.codeBlocks.map((block) => ({ content: block.codeContent, type: CodeHighlightType[block.highlightType] })),
                                 __typename: 'GenAICodeUXPrimitive'
                             },
                             __typename: 'GenAISingleLayoutViewModel'
                         }
                     };
+                    break;
                 case RichSubMessageType.CONTENT_ITEMS:
                     return {
                         view_model: {
@@ -83,15 +86,17 @@ export const toUnified = (submessages) =>
                             __typename: 'GenAIHScrollLayoutViewModel'
                         }
                     };
+                    break;
                 case RichSubMessageType.LATEX:
+                    const latexMetadata = submessage.latexMetadata;
                     const item = {
-                        latex_expression: submessage.latexMetadata.expressions[0]?.latexExpression,
-                        font_height: submessage.latexMetadata.expressions[0]?.fontHeight,
+                        latex_expression: latexMetadata.expressions[0]?.latexExpression,
+                        font_height: latexMetadata.expressions[0]?.fontHeight,
                         padding: 15,
                         latex_image: {
-                            url: submessage.latexMetadata.expressions[0]?.url,
-                            width: submessage.latexMetadata.expressions[0]?.width || 388,
-                            height: submessage.latexMetadata.expressions[0]?.height || 160
+                            url: latexMetadata.expressions[0]?.url,
+                            width: latexMetadata.expressions[0]?.width || 388,
+                            height: latexMetadata.expressions[0]?.height || 160
                         }
                     };
                     return {
@@ -104,17 +109,20 @@ export const toUnified = (submessages) =>
                             __typename: 'GenAISingleLayoutViewModel'
                         }
                     };
+                    break;
                 case RichSubMessageType.TABLE:
+                    const tableMetadata = submessage.tableMetadata;
                     return {
                         view_model: {
                             primitive: {
-                                title: submessage.tableMetadata.title,
-                                rows: submessage.tableMetadata.rows.map((row) => ({ is_header: row.isHeading, cells: row.items, markdown_cells: [] })),
+                                title: tableMetadata.title,
+                                rows: tableMetadata.rows.map((row) => ({ is_header: row.isHeading, cells: row.items, markdown_cells: [] })),
                                 __typename: 'GenATableUXPrimitive'
                             },
                             __typename: 'GenAISingleLayoutViewModel'
                         }
                     };
+                    break;
                 case RichSubMessageType.TEXT:
                     return {
                         view_model: {
@@ -122,202 +130,236 @@ export const toUnified = (submessages) =>
                             __typename: 'GenAISingleLayoutViewModel'
                         }
                     };
+                    break;
             }
             return submessage;
         })
     });
-export const prepareRichCodeBlock = ({ header, code, footer, language } = {}) => {
-    language ??= 'javascript';
-    const submessages = [];
-    if (header) {
-        submessages.push({
-           messageType: RichSubMessageType.TEXT,
-           messageText: header
-        });
-    }
-    submessages.push({
-        messageType: RichSubMessageType.CODE,
-        codeMetadata: {
-            codeLanguage: language,
-            codeBlocks: tokenizeCode(code, language)
-        }
-    });
-    if (footer) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: footer
-        });
-    }
-    const unified = toUnified(submessages);
-    return {
-        submessages,
-        messageType: proto.AIRichResponseMessageType.AI_RICH_RESPONSE_TYPE_STANDARD,
-        unifiedResponse: {
-            data: textEncoder.encode(JSON.stringify(unified))
-        },
-        contextInfo: FORWARDED_AI_BOT_INFO
-    };
-};
-export const prepareRichReels = ({ header, items, footer } = {}) => {
-    const submessages = [];
-    if (header) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: header
-        });
-    }
-    submessages.push({
-        messageType: RichSubMessageType.CONTENT_ITEMS,
-        contentItemsMetadata: {
-            itemsMetadata: items.map((item) => ({ reelItem: item })),
-            contentType: proto.AIRichResponseContentItemsMetadata.ContentType.CAROUSEL
-        }
-    });
-    if (footer) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: footer
-        });
-    }
-    const unified = toUnified(submessages);
-    return {
-        submessages,
-        messageType: proto.AIRichResponseMessageType.AI_RICH_RESPONSE_TYPE_STANDARD,
-        unifiedResponse: {
-            data: textEncoder.encode(JSON.stringify(unified))
-        },
-        contextInfo: FORWARDED_AI_BOT_INFO
-    };
-};
-export const prepareRichLatex = ({ header, text, expressions, footer } = {}) => {
-    const submessages = [];
-    if (header) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: header
-        });
-    }
-    submessages.push({
-        messageType: RichSubMessageType.LATEX,
-        latexMetadata: {
-            text,
-            expressions
+// Lia@Note 17-04-26 --- WIP
+export const buildAdditionalBotMetadataContext = (submessages) => {
+    const sources = [];
+    const mediaDetailsMetadataList = [];
+    for (let i = 0; i < submessages.length; i++) {
+        const submessage = submessages[i];
+        switch (submessage.messageType) {
+            case RichSubMessageType.CONTENT_ITEMS:
+                const itemsMetadata = submessage.contentItemsMetadata.itemsMetadata;
+                for (let n = 0; n < itemsMetadata.length; n++) {
+                    const reelItem = itemsMetadata[n].reelItem;
+                    sources.push({
+                        provider: 0,
+                        thumbnailCdnUrl: reelItem.thumbnailUrl,
+                        sourceProviderUrl: reelItem.videoUrl,
+                        sourceQuery: '',
+                        faviconCdnUrl: '',
+                        citationNumber: i + 1,
+                        sourceTitle: reelItem.title
+                    });
+                    mediaDetailsMetadataList.push({
+                        id: randomBytes(32).toString('hex'),
+                        previewMedia: {
+                            fileSha256: '',
+                            mediaKey: '',
+                            fileEncSha256: '',
+                            directPath: '',
+                            mediaKeyTimestamp: unixTimestampSeconds(),
+                            mimetype: 'image/jpeg'
+                        }
+                    });
+                }
+                break;
+            case RichSubMessageType.LATEX:
+                const expressions = submessage.latexMetadata.expressions;
+                for (let n = 0; n < expressions.length; n++) {
+                    const expression = expressions[n];
+                    mediaDetailsMetadataList.push({
+                        id: randomBytes(32).toString('hex'),
+                        previewMedia: {
+                            fileSha256: '',
+                            mediaKey: '',
+                            fileEncSha256: '',
+                            directPath: '',
+                            mediaKeyTimestamp: unixTimestampSeconds(),
+                            mimetype: 'image/jpeg'
+                        }
+                    });
+                }
+                break;
         }
-    });
-    if (footer) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: footer
-        });
     }
-    const unified = toUnified(submessages);
-    return {
-        submessages,
-        messageType: proto.AIRichResponseMessageType.AI_RICH_RESPONSE_TYPE_STANDARD,
-        unifiedResponse: {
-            data: textEncoder.encode(JSON.stringify(unified))
-        },
-        contextInfo: FORWARDED_AI_BOT_INFO
-    };
-};
-export const prepareRichTable = ({ header, title, table, footer } = {}) => {
-    const tableRows = table.map((items, index) => ({
-        isHeading: index == 0,
-        items
-    }));
-    const submessages = [];
-    if (header) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: header
+    return { sources, mediaDetailsMetadataList };
+}
+export const prepareRichResponseMessage = (content) => {
+    const { code, contentText, expressions, footerText, headerText, items, language, richResponse, table, text, title } = content;
+    let submessages = [];
+    if (Array.isArray(richResponse)) {
+        submessages = richResponse.map((submessage) => {
+            if (submessage.text) {
+                return {
+                    messageType: RichSubMessageType.TEXT,
+                    messageText: submessage.text
+                };
+            }
+            else if (submessage.code) {
+                return {
+                    messageType: RichSubMessageType.CODE,
+                    codeMetadata: {
+                        codeLanguage: submessage.language,
+                        codeBlocks: submessage.code
+                    }
+                };
+            }
+            else if (submessage.expressions) {
+                return {
+                    messageType: RichSubMessageType.LATEX,
+                    latexMetadata: {
+                        text: submessage.text,
+                        expressions: submessage.expressions
+                    }
+                };
+            }
+            else if (submessage.items) {
+                return {
+                    messageType: RichSubMessageType.CONTENT_ITEMS,
+                    contentItemsMetadata: {
+                        itemsMetadata: submessage.items
+                    }
+                };
+            }
+            else if (submessage.table) {
+                return {
+                    messageType: RichSubMessageType.TABLE,
+                    tableMetadata: {
+                        title: submessage.title,
+                        rows: submessage.table
+                    }
+                };
+            }
+            return submessage;
         });
     }
-    submessages.push({
-        messageType: RichSubMessageType.TABLE,
-        tableMetadata: {
-            title,
-            rows: tableRows
+    else {
+        if (headerText) {
+            submessages.push({
+                messageType: RichSubMessageType.TEXT,
+                messageText: headerText
+            });
         }
-    });
-    if (footer) {
-        submessages.push({
-            messageType: RichSubMessageType.TEXT,
-            messageText: footer
-        });
-    }
-    const unified = toUnified(submessages);
-    return {
-        submessages,
-        messageType: proto.AIRichResponseMessageType.AI_RICH_RESPONSE_TYPE_STANDARD,
-        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 {
+        if (contentText) {
+            submessages.push({
                 messageType: RichSubMessageType.TEXT,
-                messageText: submessage.text
-            };
+                messageText: contentText
+            });
         }
-        else if (submessage.code) {
-            return {
+        if (code) {
+            language ??= 'javascript';
+            submessages.push({
                 messageType: RichSubMessageType.CODE,
                 codeMetadata: {
-                    codeLanguage: submessage.language,
-                    codeBlocks: submessage.code
+                    codeLanguage: language,
+                    codeBlocks: tokenizeCode(code, language)
                 }
-            };
+            });
         }
-        else if (submessage.expressions) {
-            return {
+        else if (expressions) {
+            submessages.push({
                 messageType: RichSubMessageType.LATEX,
                 latexMetadata: {
-                    text: submessage.text,
-                    expressions: submessage.expressions
+                    text,
+                    expressions
                 }
-            };
+            });
         }
-        else if (submessage.items) {
-            return {
+        else if (items) {
+            submessages.push({
                 messageType: RichSubMessageType.CONTENT_ITEMS,
                 contentItemsMetadata: {
-                    itemsMetadata: submessage.items
+                    itemsMetadata: items.map((item) => ({ reelItem: item })),
+                    contentType: proto.AIRichResponseContentItemsMetadata.ContentType.CAROUSEL
                 }
-            };
+            });
         }
-        else if (submessage.table) {
-            return {
+        else if (table) {
+            const tableRows = table.map((items, index) => ({
+                isHeading: index == 0,
+                items
+            }));
+            submessages.push({
                 messageType: RichSubMessageType.TABLE,
                 tableMetadata: {
-                    title: submessage.title,
-                    rows: submessage.table
+                    title,
+                    rows: tableRows
                 }
-            };
+            });
         }
-        return submessage;
-    });
+        if (footerText) {
+            submessages.push({
+                messageType: RichSubMessageType.TEXT,
+                messageText: footerText
+            });
+        }
+    }
     const unified = toUnified(submessages);
-    return {
+    const message = wrapToBotForwardedMessage({
         submessages,
         messageType: proto.AIRichResponseMessageType.AI_RICH_RESPONSE_TYPE_STANDARD,
         unifiedResponse: {
             data: textEncoder.encode(JSON.stringify(unified))
         },
-        contextInfo: FORWARDED_AI_BOT_INFO
-    };
+        contextInfo: {
+            isForwarded: true,
+            forwardingScore: 1,
+            forwardedAiBotMessageInfo: { botJid: '867051314767696@bot' },
+            forwardOrigin: 4
+        }
+    });
+    // Lia@Note 17-04-26 --- TODO: Fill mediaDetailsMetadataList and sources field
+    const { sources, mediaDetailsMetadataList } = buildAdditionalBotMetadataContext(submessages);
+    const botMetadata = message.messageContextInfo.botMetadata;
+    if (sources.length > 0) {
+        botMetadata.richResponseSourcesMetadata = { sources };
+    }
+    if (mediaDetailsMetadataList.length > 0) {
+        botMetadata.unifiedResponseMutation = { mediaDetailsMetadataList };
+    }
+    return message;
+}
+// Lia@Note 17-04-26 --- signature and certificateChain for proofs[] field
+export const botMetadataSignature = () => {
+    const signature = new Uint8Array(64);
+    getRandomValues(signature);
+    return signature;
+}
+export const botMetadataCertificate = (length = 700) => {
+    const certificate = new Uint8Array(length);
+    certificate[0] = 48;
+    certificate[1] = 130;
+    getRandomValues(certificate.subarray(2));
+    return certificate;
 }
-export const wrapToBotForwardedMessage = (message) =>
+export const wrapToBotForwardedMessage = (richResponseMessage) =>
     ({
         messageContextInfo: {
             botMetadata: {
+                pluginMetadata: {},
                 // Lia@Note 09-04-26 --- TODO: Fill verificationMetadata field
-                verificationMetadata: {},
+                verificationMetadata: {
+                    proofs: [
+                        {
+                            certificateChain: [
+                                botMetadataCertificate(684),
+                                botMetadataCertificate(892)
+                            ],
+                            version: 1,
+                            useCase: 1,
+                            signature: botMetadataSignature()
+                        }
+                    ]
+                },
                 botRenderingConfigMetadata: BOT_RENDERING_CONFIG_METADATA
             }
         },
-        botForwardedMessage: { message }
+        botForwardedMessage: {
+            message: { richResponseMessage }
+        }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@itsliaaa/baileys",
-   "version": "0.1.23",
+   "version": "0.1.24",
    "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",
@@ -24,6 +24,7 @@
       "baileys",
       "baileys-fork",
       "baileys-mod",
+      "interactive-messages",
       "js-whatsapp",
       "multi-device",
       "whatsapp",