jagproject 26.3.28 → 26.3.29

package/lib/Defaults/index.js

@@ -48,65 +48,6 @@ exports.PROCESSABLE_HISTORY_TYPES = [
     index_js_1.proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA,
     index_js_1.proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
 ];
-const INTERACTIVE_MESSAGE_KEYS = ['interactiveMessage', 'buttonsMessage', 'listMessage', 'templateMessage'];
-const buildInteractiveMessageContextInfo = (existing) => ({
-    ...(existing || {}),
-    deviceListMetadata: existing?.deviceListMetadata || {},
-    deviceListMetadataVersion: existing?.deviceListMetadataVersion || 2
-});
-const wrapInteractiveMessageForLegacyCompatibility = (msg) => {
-    if (!msg || typeof msg !== 'object') {
-        return msg;
-    }
-    const topLevelHasInteractive = INTERACTIVE_MESSAGE_KEYS.some(key => !!msg[key]);
-    const wrappedViewOnceMessage = msg.viewOnceMessage?.message;
-    const wrappedViewOnceV2Message = msg.viewOnceMessageV2?.message;
-    const wrappedViewOnceV2ExtMessage = msg.viewOnceMessageV2Extension?.message;
-    const wrappedMessage = wrappedViewOnceMessage || wrappedViewOnceV2Message || wrappedViewOnceV2ExtMessage;
-    const wrappedHasInteractive = !!(wrappedMessage && INTERACTIVE_MESSAGE_KEYS.some(key => !!wrappedMessage[key]));
-    if (wrappedHasInteractive) {
-        const patchedWrappedMessage = {
-            ...wrappedMessage,
-            messageContextInfo: buildInteractiveMessageContextInfo(wrappedMessage.messageContextInfo)
-        };
-        if (wrappedViewOnceMessage) {
-            return {
-                ...msg,
-                viewOnceMessage: {
-                    ...msg.viewOnceMessage,
-                    message: patchedWrappedMessage
-                }
-            };
-        }
-        if (wrappedViewOnceV2Message) {
-            return {
-                ...msg,
-                viewOnceMessageV2: {
-                    ...msg.viewOnceMessageV2,
-                    message: patchedWrappedMessage
-                }
-            };
-        }
-        return {
-            ...msg,
-            viewOnceMessageV2Extension: {
-                ...msg.viewOnceMessageV2Extension,
-                message: patchedWrappedMessage
-            }
-        };
-    }
-    if (!topLevelHasInteractive) {
-        return msg;
-    }
-    return {
-        viewOnceMessage: {
-            message: {
-                ...msg,
-                messageContextInfo: buildInteractiveMessageContextInfo(msg.messageContextInfo)
-            }
-        }
-    };
-};
 exports.DEFAULT_CONNECTION_CONFIG = {
     version: exports.version,
     browser: browser_utils_js_1.Browsers.macOS('Chrome'),
@@ -123,7 +64,34 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     auth: undefined,
     markOnlineOnConnect: true,
     syncFullHistory: true,
-    patchMessageBeforeSending: msg => wrapInteractiveMessageForLegacyCompatibility(msg),
+    patchMessageBeforeSending: msg => {
+        const content = msg?.viewOnceMessage?.message || msg?.viewOnceMessageV2?.message || msg?.viewOnceMessageV2Extension?.message || msg;
+        const requiresPatch = !!(content?.buttonsMessage || content?.templateMessage || content?.listMessage || content?.interactiveMessage);
+        if (!requiresPatch)
+            return msg;
+        const wrapped = msg?.viewOnceMessage || msg?.viewOnceMessageV2 || msg?.viewOnceMessageV2Extension
+            ? msg
+            : {
+                viewOnceMessage: {
+                    message: {
+                        messageContextInfo: {
+                            deviceListMetadataVersion: 2,
+                            deviceListMetadata: {}
+                        },
+                        ...msg
+                    }
+                }
+            };
+        const inner = wrapped?.viewOnceMessage?.message || wrapped?.viewOnceMessageV2?.message || wrapped?.viewOnceMessageV2Extension?.message;
+        if (inner) {
+            inner.messageContextInfo = {
+                deviceListMetadataVersion: 2,
+                deviceListMetadata: {},
+                ...(inner.messageContextInfo || {})
+            };
+        }
+        return wrapped;
+    },
     shouldSyncHistoryMessage: ({ syncType }) => {
         return syncType !== index_js_1.proto.HistorySync.HistorySyncType.FULL;
     },

package/lib/Socket/messages-send.js

@@ -499,6 +499,13 @@ const makeMessagesSocket = (config) => {
             messageContextInfo: message.messageContextInfo
         };
         const extraAttrs = {};
+        if ((message?.interactiveMessage || message?.buttonsMessage || message?.listMessage || message?.templateMessage)
+            && !additionalNodes?.some(node => node?.tag === 'biz')) {
+            const btnNode = getButtonArgs(message);
+            if (btnNode) {
+                additionalNodes = [...(additionalNodes || []), btnNode];
+            }
+        }
         if (participant) {
             if (!isGroup && !isStatus) {
                 additionalAttributes = { ...additionalAttributes, device_fanout: 'false' };

package/lib/Socket/newsletter.js

@@ -107,7 +107,23 @@ const makeNewsletterSocket = (config) => {
                 }
             };
             const result = await executeWMexQuery(variables, index_js_1.QueryIds.METADATA, index_js_1.XWAPaths.xwa2_newsletter_metadata);
-            return parseNewsletterMetadata(result);
+            const meta = parseNewsletterMetadata(result);
+            if (!meta)
+                return meta;
+            const thread = meta.thread_metadata || {};
+            const normalizedName = typeof meta.name === 'string' ? meta.name : (meta.name?.text || thread.name?.text || '');
+            const normalizedSubscribers = typeof meta.subscribers === 'number'
+                ? meta.subscribers
+                : Number(meta.subscribers || thread.subscribers_count || 0);
+            const normalizedVerification = typeof meta.verification === 'string'
+                ? meta.verification
+                : (thread.verification || 'UNVERIFIED');
+            return {
+                ...meta,
+                name: normalizedName,
+                subscribers: Number.isFinite(normalizedSubscribers) ? normalizedSubscribers : 0,
+                verification: normalizedVerification
+            };
         },
         newsletterFollow: (jid) => {
             return executeWMexQuery({ newsletter_id: jid }, index_js_1.QueryIds.FOLLOW, index_js_1.XWAPaths.xwa2_newsletter_follow);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jagproject",
-  "version": "26.03.28",
+  "version": "26.03.29",
   "update": "22 Maret 2026",
   "description": "WhatsApp Web API Library",
   "keywords": [