plogme 2.0.3 → 2.0.5

package/lib/Socket/messages-send.js

@@ -5,7 +5,7 @@ import { proto } from '../../WAProto/index.js';
 import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { aggregateMessageKeysNotFromMe, assertMediaContent, assertMeId, bindWaitForEvent, buildLinkPreview, decryptMediaRetryData, DEF_MEDIA_HOST, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, extractImageThumb, generateMessageIDV2, generateParticipantHashV2, generateWAMessage, generateWAMessageFromContent, getStatusCodeForMediaRetry, makeWhatsAppFlowButton, getUrlFromDirectPath, getWAUploadToServer, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, prepareWAMessageMedia, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
-import { prepareRichMenuMessage, prepareRichResponseMessage, prepareRichGenerationMessage, prepareCopyToClipboardMessage, prepareRichTextMessage, prepareRichQuoteMessage, prepareRichImageMessage, prepareRichLinkMessage, prepareGridImageMessage, prepareHtmlMessage, prepareRichHtmlMessage, attachBotVerificationProofs, hasVerifiableProofs } from '../Utils/rich-message-utils.js';
+import { prepareRichMenuMessage, prepareA2UIMessage, prepareA2UICommandMenu, prepareAIRichCommandMenu, prepareSocialEntityMessage, prepareInstagramProfileMessage, prepareRichResponseMessage, prepareRichGenerationMessage, prepareCopyToClipboardMessage, prepareRichTextMessage, prepareRichQuoteMessage, prepareRichImageMessage, prepareRichLinkMessage, prepareGridImageMessage, prepareVerticalAlbumMessage, prepareVideoGridMessage, prepareHtmlMessage, prepareRichHtmlMessage, attachBotVerificationProofs, hasVerifiableProofs } from '../Utils/rich-message-utils.js';
 import { generateSlotMachineHtml } from '../Utils/games/slot-machine.js';
 import { generateMiniAppHtml } from '../Utils/games/miniapp.js';
 import { generateWebsitePreviewHtml, generateLinkPreviewHtml } from '../Utils/games/website-preview.js';
@@ -1051,7 +1051,7 @@ export const makeMessagesSocket = (config) => {
         await relayMessage(jid, fullMsg.message, relayOptions);
 
         const richEnvelope = fullMsg.message?.botForwardedMessage?.message?.richResponseMessage;
-        if (options.renderRichResponse !== false && richEnvelope) {
+        if (options.renderRichResponse !== false && (richEnvelope || options.forceRichEdit || fullMsg.message?.interactiveMessage?.bloksWidget)) {
             const editContent = proto.Message.fromObject({
                 botForwardedMessage: {
                     message: {
@@ -1276,18 +1276,39 @@ export const makeMessagesSocket = (config) => {
         },
         sendTable: async (jid, title, headers, rows, quoted, options = {}) => {
             const { message, messageId } = generateTableContent(title, headers, rows, quoted, options);
-            await relayMessage(jid, message, { messageId });
-            return { message, messageId };
+            const fullMsg = generateWAMessageFromContent(jid, message, {
+                logger,
+                userJid: authState.creds.me?.id,
+                messageId: options.messageId || messageId || generateMessageIDV2(jid),
+                quoted,
+                ...options
+            });
+            await relayRichMessage(jid, fullMsg, options);
+            return fullMsg;
         },
         sendList: async (jid, title, items, quoted, options = {}) => {
             const { message, messageId } = generateListContent(title, items, quoted, options);
-            await relayMessage(jid, message, { messageId });
-            return { message, messageId };
+            const fullMsg = generateWAMessageFromContent(jid, message, {
+                logger,
+                userJid: authState.creds.me?.id,
+                messageId: options.messageId || messageId || generateMessageIDV2(jid),
+                quoted,
+                ...options
+            });
+            await relayRichMessage(jid, fullMsg, options);
+            return fullMsg;
         },
         sendCodeBlock: async (jid, code, quoted, options = {}) => {
             const { message, messageId } = generateCodeBlockContent(code, quoted, options);
-            await relayMessage(jid, message, { messageId });
-            return { message, messageId };
+            const fullMsg = generateWAMessageFromContent(jid, message, {
+                logger,
+                userJid: authState.creds.me?.id,
+                messageId: options.messageId || messageId || generateMessageIDV2(jid),
+                quoted,
+                ...options
+            });
+            await relayRichMessage(jid, fullMsg, options);
+            return fullMsg;
         },
         sendCarousel: async (jid, cards, options = {}) => {
             if (!Array.isArray(cards) || cards.length === 0) {
@@ -1323,8 +1344,15 @@ export const makeMessagesSocket = (config) => {
         },
         sendLatex: async (jid, quoted, options = {}) => {
             const { message, messageId } = generateLatexContent(quoted, { expressions: [], ...options });
-            await relayMessage(jid, message, { messageId });
-            return { message, messageId };
+            const fullMsg = generateWAMessageFromContent(jid, message, {
+                logger,
+                userJid: authState.creds.me?.id,
+                messageId: options.messageId || messageId || generateMessageIDV2(jid),
+                quoted,
+                ...options
+            });
+            await relayRichMessage(jid, fullMsg, options);
+            return fullMsg;
         },
         /**
          * Send LaTeX as rendered PNG image (like Meta AI does).
@@ -1352,8 +1380,14 @@ export const makeMessagesSocket = (config) => {
                 headerText,
                 footer
             });
-            await relayMessage(jid, message, { messageId });
-            return { message, messageId };
+            const fullMsg = generateWAMessageFromContent(jid, message, {
+                logger,
+                userJid: authState.creds.me?.id,
+                messageId: options.messageId || messageId || generateMessageIDV2(jid),
+                ...options
+            });
+            await relayRichMessage(jid, fullMsg, options);
+            return fullMsg;
         },
         sendMetaAI: async (a, b, c = {}) => {
             // baron signature: (jid, text, opts) — README signature: (text, opts)
@@ -2353,6 +2387,103 @@ export const makeMessagesSocket = (config) => {
         }
         return fullMsg;
     };
+    /**
+     * Sends the A2UI interactive card/menu format used by WhatsApp's large
+     * command-card presentation. This is intentionally separate from richMenu
+     * because it is an interactiveMessage, not an AIRich unifiedResponse.
+     */
+    socket.sendA2UICommandMenu = async (jid, content = {}, options = {}) => {
+        if (!jid) throw new Boom('sendA2UICommandMenu requires a target JID', { statusCode: 400 });
+        const { image, ...menuContent } = content || {};
+        let imageMessage;
+        if (image) {
+            const prepared = await prepareWAMessageMedia({ image }, { upload: waUploadToServer });
+            imageMessage = prepared.imageMessage;
+        }
+        const wrapped = prepareA2UICommandMenu({ ...menuContent, imageMessage });
+        const fullMsg = await generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options,
+        });
+        await relayRichMessage(jid, fullMsg, { ...options, forceRichEdit: true });
+        if (config.emitOwnEvents) {
+            process.nextTick(async () => {
+                await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+            });
+        }
+        return fullMsg;
+    };
+    /** Send arbitrary A2UI/interactive payloads; sendA2UICommandMenu is a preset wrapper. */
+    socket.sendA2UIMessage = async (jid, content = {}, options = {}) => {
+        if (!jid) throw new Boom('sendA2UIMessage requires a target JID', { statusCode: 400 });
+        const { image, ...payload } = content || {};
+        let imageMessage;
+        if (image) {
+            const prepared = await prepareWAMessageMedia({ image }, { upload: waUploadToServer });
+            imageMessage = prepared.imageMessage;
+        }
+        const wrapped = prepareA2UIMessage({ ...payload, imageMessage });
+        const fullMsg = await generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options,
+        });
+        await relayRichMessage(jid, fullMsg, { ...options, forceRichEdit: true });
+        if (config.emitOwnEvents) process.nextTick(async () => { await messageMutex.mutex(() => upsertMessage(fullMsg, 'append')); });
+        return fullMsg;
+    };
+
+    /** Sends the manually serialized AIRich command card shown in the screenshot. */
+    socket.sendAIRichCommandMenu = async (jid, content = {}, options = {}) => {
+        if (!jid) throw new Boom('sendAIRichCommandMenu requires a target JID', { statusCode: 400 });
+        const wrapped = prepareAIRichCommandMenu(content);
+        const fullMsg = await generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options,
+        });
+        await relayRichMessage(jid, fullMsg, options);
+        if (config.emitOwnEvents) {
+            process.nextTick(async () => {
+                await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+            });
+        }
+        return fullMsg;
+    };
+    /** Send a provider-neutral AIRich social/entity result card. */
+    socket.sendSocialEntity = async (jid, content = {}, options = {}) => {
+        if (!jid) throw new Boom('sendSocialEntity requires a target JID', { statusCode: 400 });
+        const wrapped = prepareSocialEntityMessage(content);
+        const fullMsg = await generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options,
+        });
+        await relayRichMessage(jid, fullMsg, options);
+        if (config.emitOwnEvents) process.nextTick(async () => { await messageMutex.mutex(() => upsertMessage(fullMsg, 'append')); });
+        return fullMsg;
+    };
+
+    /** Send the primary Instagram profile result using the universal social/entity API. */
+    socket.sendInstagramProfile = async (jid, content = {}, options = {}) => {
+        if (!jid) throw new Boom('sendInstagramProfile requires a target JID', { statusCode: 400 });
+        const wrapped = prepareInstagramProfileMessage(content);
+        const fullMsg = await generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options,
+        });
+        await relayRichMessage(jid, fullMsg, options);
+        if (config.emitOwnEvents) process.nextTick(async () => { await messageMutex.mutex(() => upsertMessage(fullMsg, 'append')); });
+        return fullMsg;
+    };
+
     /** Sends a rich response with experimental BotInfrastructureDiagnostics metadata. */
     socket.sendBotDiagnostics = async (jid, content = {}, options = {}) => {
         if (!jid) throw new Boom('sendBotDiagnostics requires a target JID', { statusCode: 400 });
@@ -2616,38 +2747,58 @@ export const makeMessagesSocket = (config) => {
 
 
     /**
-     * Sends an AIRich GRID_IMAGE album. Unlike the legacy albumMessage
-     * collection, this is one forwarded unified-response message containing
-     * the requested image primitives.
+     * Sends a full-width vertical AIRich album. Unlike the legacy
+     * albumMessage collection or compact GRID_IMAGE layout, this is one
+     * forwarded unified-response message with one large media item per row.
      */
     socket.sendAlbumMessage = async (jid, medias = [], options = {}) => {
         if (!jid) throw new Boom('sendAlbumMessage requires a target JID', { statusCode: 400 });
         if (!Array.isArray(medias) || medias.length < 2) {
             throw new Boom('sendAlbumMessage requires at least two media items', { statusCode: 400 });
         }
-        const imageUrls = medias.map((media) => {
+        const albumItems = medias.map((media) => {
             const raw = media?.type && media?.data ? media.data : (media?.image ?? media);
             if (media?.video || media?.type === 'video') {
-                throw new Boom('GRID_IMAGE albums support images only', { statusCode: 400 });
-            }
-            const sourceUrl = typeof raw === 'string' ? raw : (raw?.sourceUrl || raw?.url || '');
-            if (!sourceUrl) {
-                throw new Boom('Each GRID_IMAGE album item requires an image URL', { statusCode: 400 });
+                const video = media?.video || raw;
+                const sourceUrl = typeof video === 'string' ? video : (video?.url || video?.videoUrl || '');
+                if (!sourceUrl) throw new Boom('Each video album item requires a video URL', { statusCode: 400 });
+                return { type: 'video', video: { ...video, url: sourceUrl } };
             }
             return {
-                sourceUrl,
-                imagePreviewUrl: raw?.imagePreviewUrl || raw?.previewUrl || sourceUrl,
-                imageHighResUrl: raw?.imageHighResUrl || raw?.highResUrl || raw?.url || sourceUrl,
-                darkModePreviewUrl: raw?.darkModePreviewUrl,
-                darkModeHighResUrl: raw?.darkModeHighResUrl,
-                width: raw?.width || media?.width || 600,
-                height: raw?.height || media?.height || 400,
-                darkWidth: raw?.darkWidth || media?.darkWidth,
-                darkHeight: raw?.darkHeight || media?.darkHeight
+                type: 'image',
+                image: raw
             };
         });
-        const wrapped = prepareGridImageMessage({
-            imageUrls,
+        const wrapped = prepareVerticalAlbumMessage({
+            items: albumItems,
+            verificationMetadata: options.verificationMetadata
+        });
+        const fullMsg = generateWAMessageFromContent(jid, wrapped, {
+            logger,
+            userJid: authState.creds.me?.id,
+            messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id || jid),
+            ...options
+        });
+        await relayRichMessage(jid, fullMsg, options);
+        if (config.emitOwnEvents) {
+            process.nextTick(async () => {
+                await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+            });
+        }
+        return fullMsg;
+    };
+
+    /**
+     * Sends a unified-response video grid. This uses GenAIVideoPrimitive items
+     * inside GenAIGridLayoutViewModel; it is not the image-only GRID_IMAGE type.
+     */
+    socket.sendVideoGridMessage = async (jid, videos = [], options = {}) => {
+        if (!jid) throw new Boom('sendVideoGridMessage requires a target JID', { statusCode: 400 });
+        if (!Array.isArray(videos) || videos.length < 2) {
+            throw new Boom('sendVideoGridMessage requires at least two videos', { statusCode: 400 });
+        }
+        const wrapped = prepareVideoGridMessage({
+            videos,
             verificationMetadata: options.verificationMetadata
         });
         const fullMsg = generateWAMessageFromContent(jid, wrapped, {
@@ -2692,11 +2843,7 @@ export const makeMessagesSocket = (config) => {
             messageId: options.messageId || generateMessageIDV2(authState.creds.me?.id),
             ...options
         });
-        await relayMessage(jid, fullMsg.message, {
-            messageId: fullMsg.key.id,
-            useCachedGroupMetadata: options.useCachedGroupMetadata,
-            statusJidList: options.statusJidList
-        });
+        await relayRichMessage(jid, fullMsg, { ...options, forceRichEdit: true });
         return fullMsg;
     };
 

package/lib/Utils/messages.js

@@ -1592,7 +1592,16 @@ export const generateWAMessageContent = async (message, options) => {
         m = { lottieStickerMessage: { message: m } };
     }
     else if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
-        m = { viewOnceMessage: { message: m } };
+        // Text view-once clients expect the flag on the inner
+        // ExtendedTextMessage. Media continues to use the standard outer
+        // viewOnceMessage envelope.
+        if (m.extendedTextMessage) {
+            m.extendedTextMessage.viewOnce = true;
+        }
+        else {
+            m = { viewOnceMessage: { message: m } };
+        }
+        delete message.viewOnce;
     }
     // Lia@Changes 03-02-26 --- Add "viewOnceV2" boolean to wrap message into viewOnceMessageV2 like "viewOnce"
     else if (hasOptionalProperty(message, 'viewOnceV2') && !!message.viewOnceV2) {