violetics 7.0.6-alpha → 7.0.7-alpha

package/lib/Defaults/index.js

@@ -2,9 +2,9 @@ import { proto } from '../../WAProto/index.js';
 import { makeLibSignalRepository } from '../Signal/libsignal.js';
 import { Browsers } from '../Utils/browser-utils.js';
 import logger from '../Utils/logger.js';
-const version = [2, 3000, 1033846690];
+const version = [2, 3000, 1035194821];
 export const UNAUTHORIZED_CODES = [401, 403, 419];
-export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_show_system_message":false,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
+export const BIZ_BOT_SUPPORT_PAYLOAD = '{"version":1,"is_ai_message":true,"should_upload_client_logs":false,"should_show_system_message":false,"ticket_id":"7004947587700716","citation_items":[],"ticket_locale":"us"}';
 export const DEFAULT_ORIGIN = 'https://web.whatsapp.com';
 export const CALL_VIDEO_PREFIX = 'https://call.whatsapp.com/video/';
 export const CALL_AUDIO_PREFIX = 'https://call.whatsapp.com/voice/';
@@ -26,7 +26,6 @@ export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0';
 export const DICT_VERSION = 3;
 export const KEY_BUNDLE_TYPE = Buffer.from([5]);
 export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]); // last is "DICT_VERSION"
-export const OLD_GROUP_ID_REGEX = /^(\d{1,15})-(\d+)@g\.us$/;
 /** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
 export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g;
 export const WA_CERT_DETAILS = {
@@ -53,7 +52,7 @@ export const DEFAULT_CONNECTION_CONFIG = {
     emitOwnEvents: true,
     defaultQueryTimeoutMs: 60000,
     customUploadHosts: [],
-    retryRequestDelayMs: 0,
+    retryRequestDelayMs: 250,
     maxMsgRetryCount: 3,
     fireInitQueries: true,
     auth: undefined,
@@ -65,7 +64,7 @@ export const DEFAULT_CONNECTION_CONFIG = {
     },
     shouldIgnoreJid: () => false,
     linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 5, delayBetweenTriesMs: 3000 },
+    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
     generateHighQualityLinkPreview: false,
     enableAutoSessionRecreation: true,
     enableRecentMessageCache: true,
@@ -86,14 +85,14 @@ export const MEDIA_PATH_MAP = {
     audio: '/mms/audio',
     sticker: '/mms/image',
     'sticker-pack': '/mms/sticker-pack',
-    'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
+ 	'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
     'thumbnail-link': '/mms/thumbnail-link',
     'product-catalog-image': '/product/image',
     'md-app-state': '',
     'md-msg-hist': '/mms/md-app-state',
     'biz-cover-photo': '/pps/biz-cover-photo'
 };
-// vltcs@changes 06-02-26 --- Add newsletter media path for "/m1/" instead of "/o1/" (⁠≧⁠▽⁠≦⁠)
+// Lia@Changes 06-02-26 --- Add newsletter media path for "/m1/" instead of "/o1/" (⁠≧⁠▽⁠≦⁠)
 export const NEWSLETTER_MEDIA_PATH_MAP = {
     image: '/newsletter/newsletter-image',
     video: '/newsletter/newsletter-video',
@@ -111,7 +110,7 @@ export const MEDIA_HKDF_KEY_MAPPING = {
     product: 'Image',
     ptt: 'Audio',
     'sticker-pack': 'Sticker Pack',
-    'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
+	 'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
     sticker: 'Image',
     video: 'Video',
     'thumbnail-document': 'Document Thumbnail',

package/lib/Socket/Client/websocket.js

@@ -5,7 +5,6 @@ export class WebSocketClient extends AbstractSocketClient {
     constructor() {
         super(...arguments);
         this.socket = null;
-        this._eventForwarders = [];
     }
     get isOpen() {
         return this.socket?.readyState === WebSocket.OPEN;
@@ -32,22 +31,14 @@ export class WebSocketClient extends AbstractSocketClient {
         });
         this.socket.setMaxListeners(0);
         const events = ['close', 'error', 'upgrade', 'message', 'open', 'ping', 'pong', 'unexpected-response'];
-        this._eventForwarders = [];
         for (const event of events) {
-            const handler = (...args) => this.emit(event, ...args);
-            this.socket?.on(event, handler);
-            this._eventForwarders.push({ event, handler });
+            this.socket?.on(event, (...args) => this.emit(event, ...args));
         }
     }
     async close() {
         if (!this.socket) {
             return;
         }
-        // Remove all forwarding listeners to prevent memory leaks
-        for (const { event, handler } of this._eventForwarders) {
-            this.socket?.off(event, handler);
-        }
-        this._eventForwarders = [];
         const closePromise = new Promise(resolve => {
             this.socket?.once('close', resolve);
         });

package/lib/Socket/chats.js

@@ -1,5 +1,4 @@
 import NodeCache from '@cacheable/node-cache';
-import { LRUCache } from 'lru-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { DEFAULT_CACHE_TTLS, PROCESSABLE_HISTORY_TYPES } from '../Defaults/index.js';
@@ -13,12 +12,12 @@ import { getBinaryNodeChild, getBinaryNodeChildren, isLidUser, isPnUser, jidDeco
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeSocket } from './socket.js';
 const MAX_SYNC_ATTEMPTS = 2;
+// Lia@Note 08-02-26 --- I know it's not efficient for RSS ಥ⁠‿⁠ಥ
+const USER_ID_CACHE = new Map();
 export const makeChatsSocket = (config) => {
     const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, getMessage } = config;
     const sock = makeSocket(config);
     const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, sendUnifiedSession } = sock;
-    // Scoped per-connection with LRU to prevent unbounded memory growth
-    const USER_ID_CACHE = new LRUCache({ max: 5000, ttl: 30 * 60 * 1000 });
     let privacySettings;
     let syncState = SyncState.Connecting;
     /** this mutex ensures that messages are processed in order */
@@ -508,7 +507,7 @@ export const makeChatsSocket = (config) => {
      * type = "image for the high res picture"
      */
     const profilePictureUrl = async (jid, type = 'image', timeoutMs) => {
-        // vltcs@changes 06-02-26 --- Refactor profilePictureUrl() to use tctoken and adjust error handling
+        // Lia@Changes 06-02-26 --- Refactor profilePictureUrl() to use tctoken and adjust error handling
         jid = jidNormalizedUser(jid);
         const baseContent = {
             tag: 'picture',
@@ -876,7 +875,7 @@ export const makeChatsSocket = (config) => {
         const historyMsg = getHistoryMsg(msg.message);
         const shouldProcessHistoryMsg = historyMsg
             ? shouldSyncHistoryMessage(historyMsg) &&
-            PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
+                PROCESSABLE_HISTORY_TYPES.includes(historyMsg.syncType)
             : false;
         // State machine: decide on sync and flush
         if (historyMsg && syncState === SyncState.AwaitingInitialSync) {

package/lib/Socket/messages-recv.js

@@ -18,6 +18,7 @@ export const makeMessagesRecvSocket = (config) => {
     const { ev, authState, ws, messageMutex, notificationMutex, receiptMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, sendPeerDataOperationMessage, generateMessageTag, messageRetryManager } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = makeMutex();
+    const devicesMutex = makeMutex();
     const msgRetryCache = config.msgRetryCounterCache ||
         new NodeCache({
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
@@ -33,6 +34,11 @@ export const makeMessagesRecvSocket = (config) => {
             stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY, // 1 hour
             useClones: false
         });
+    const userDevicesCache = config.userDevicesCache ??=
+        new NodeCache({
+            stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
+            useClones: false
+        });
     // Debounce identity-change session refreshes per JID to avoid bursts
     const identityAssertDebounce = new NodeCache({ stdTTL: 5, useClones: false });
     let sendActiveReceipts = false;
@@ -65,7 +71,7 @@ export const makeMessagesRecvSocket = (config) => {
             // metadata (LID details, timestamps, etc.) that the phone may omit
             await placeholderResendCache.set(messageKey?.id, msgData || true);
         }
-        await delay(500);
+        await delay(2000);
         if (!(await placeholderResendCache.get(messageKey?.id))) {
             logger.debug({ messageKey }, 'message received while resend requested');
             return 'RESOLVED';
@@ -615,6 +621,64 @@ export const makeMessagesRecvSocket = (config) => {
                 break;
         }
     };
+    const handleDevicesNotification = async (node) => {
+        const [child] = getAllBinaryNodeChildren(node);
+        const from = jidNormalizedUser(node.attrs.from);
+        const devices = getBinaryNodeChildren(child, 'device');
+        if (areJidsSameUser(from, authState.creds.me.id) ||
+            areJidsSameUser(from, authState.creds.me.lid)) {
+            const deviceJids = devices.map(d => d.attrs.jid);
+            logger.info({ deviceJids }, 'got my own devices');
+        }
+        if (!devices || !devices.length || !devices[0]) {
+            logger.debug({ from }, 'no devices in notification, skipping');
+            return;
+        }
+        const deviceJid = devices[0].attrs.jid;
+        const decoded = jidDecode(deviceJid);
+        if (!decoded) return;
+        const { user, device } = decoded;
+        const tag = child.tag;
+        if (!deviceJid) {
+            logger.debug({ tag }, 'no device jid in notification, skipping');
+            return;
+        }
+        await devicesMutex.mutex(async () => {
+            if (tag === 'update') {
+                logger.debug({ user }, `${user}'s device list updated, dropping cached devices`);
+                if (userDevicesCache) {
+                    await userDevicesCache.del(user);
+                }
+                return;
+            }
+            const existingCache = (await (userDevicesCache?.get(user))) || [];
+            if (!existingCache.length) {
+                logger.debug({ user, tag }, 'device list not cached, skipping cache update')
+                return;
+            }
+            const deviceHash = child.attrs.device_hash;
+            let updatedDevices = [];
+            switch (tag) {
+                case 'add':
+                    logger.info({ deviceHash }, 'device added');
+                    updatedDevices = [
+                        ...existingCache.filter(d => d.device !== device),
+                        { user, device }
+                    ];
+                    break;
+                case 'remove':
+                    logger.info({ deviceHash }, 'device removed');
+                    updatedDevices = existingCache.filter(d => d.device !== device);
+                    break;
+                default:
+                    logger.debug({ tag }, 'Unknown device list change tag');
+                    return;
+            }
+            if (updatedDevices.length > 0 && userDevicesCache) {
+                await userDevicesCache.set(user, updatedDevices);
+            }
+        });
+    };
     const processNotification = async (node) => {
         const result = {};
         const [child] = getAllBinaryNodeChildren(node);
@@ -639,13 +703,12 @@ export const makeMessagesRecvSocket = (config) => {
                 await handleEncryptNotification(node);
                 break;
             case 'devices':
-                const devices = getBinaryNodeChildren(child, 'device');
-                if (areJidsSameUser(child.attrs.jid, authState.creds.me.id) ||
-                    areJidsSameUser(child.attrs.lid, authState.creds.me.lid)) {
-                    const deviceData = devices.map(d => ({ id: d.attrs.jid, lid: d.attrs.lid }));
-                    logger.info({ deviceData }, 'my own devices changed');
+                try {
+                    await handleDevicesNotification(node);
+                }
+                catch (error) {
+			     		logger.error({ error, node }, 'failed to handle devices notification');
                 }
-                //TODO: drop a new event, add hashes
                 break;
             case 'server_sync':
                 const update = getBinaryNodeChild(node, 'collection');
@@ -1094,19 +1157,19 @@ export const makeMessagesRecvSocket = (config) => {
                         };
                         requestPlaceholderResend(cleanKey, msgData)
                             .then(requestId => {
-                                if (requestId && requestId !== 'RESOLVED') {
-                                    logger.debug({ msgId: msg.key.id, requestId }, 'requested placeholder resend for unavailable message');
-                                    ev.emit('messages.update', [
-                                        {
-                                            key: msg.key,
-                                            update: { messageStubParameters: [NO_MESSAGE_FOUND_ERROR_TEXT, requestId] }
-                                        }
-                                    ]);
-                                }
-                            })
+                            if (requestId && requestId !== 'RESOLVED') {
+                                logger.debug({ msgId: msg.key.id, requestId }, 'requested placeholder resend for unavailable message');
+                                ev.emit('messages.update', [
+                                    {
+                                        key: msg.key,
+                                        update: { messageStubParameters: [NO_MESSAGE_FOUND_ERROR_TEXT, requestId] }
+                                    }
+                                ]);
+                            }
+                        })
                             .catch(err => {
-                                logger.warn({ err, msgId: msg.key.id }, 'failed to request placeholder resend for unavailable message');
-                            });
+                            logger.warn({ err, msgId: msg.key.id }, 'failed to request placeholder resend for unavailable message');
+                        });
                         acked = true;
                         await sendMessageAck(node);
                         // Don't return — fall through to upsertMessage so the stub is emitted
@@ -1138,7 +1201,7 @@ export const makeMessagesRecvSocket = (config) => {
                                         logger.debug('Uploading pre-keys for error recovery');
                                         await uploadPreKeys(5);
                                         logger.debug('Waiting for server to process new pre-keys');
-                                        await delay(200);
+                                        await delay(1000);
                                     }
                                     catch (uploadErr) {
                                         logger.error({ uploadErr }, 'Pre-key upload failed, proceeding with retry anyway');
@@ -1308,12 +1371,8 @@ export const makeMessagesRecvSocket = (config) => {
     /// and adds the task to the existing buffer if we're buffering events
     const processNodeWithBuffer = async (node, identifier, exec) => {
         ev.buffer();
-        try {
-            await execTask();
-        }
-        finally {
-            ev.flush();
-        }
+        await execTask();
+        ev.flush();
         function execTask() {
             return exec(node, false).catch(err => onUnexpectedError(err, identifier));
         }

package/lib/Socket/messages-send.js

@@ -2,7 +2,7 @@ import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
 import { proto } from '../../WAProto/index.js';
-import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, OLD_GROUP_ID_REGEX, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
+import { BIZ_BOT_SUPPORT_PAYLOAD, DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults/index.js';
 import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, delay, encodeNewsletterMessage, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateParticipantHashV2, generateWAMessageFromContent, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, hasValidAlbumMedia, MessageRetryManager, normalizeMessageContent, parseAndInjectE2ESessions, shouldIncludeBizBinaryNode, unixTimestampSeconds } from '../Utils/index.js';
 import { AssociationType } from '../Types/index.js';
 import { getUrlInfo } from '../Utils/link-preview.js';
@@ -15,7 +15,7 @@ export const makeMessagesSocket = (config) => {
     const { logger, linkPreviewImageThumbnailWidth, generateHighQualityLinkPreview, options: httpRequestOptions, patchMessageBeforeSending, cachedGroupMetadata, enableRecentMessageCache, maxMsgRetryCount } = config;
     const sock = makeNewsletterSocket(config);
     const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral } = sock;
-    const userDevicesCache = config.userDevicesCache ||
+    const userDevicesCache = config.userDevicesCache ??=
         new NodeCache({
             stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES, // 5 minutes
             useClones: false
@@ -129,21 +129,21 @@ export const makeMessagesSocket = (config) => {
         const toFetch = [];
         const jidsWithUser = jids
             .map(jid => {
-                const decoded = jidDecode(jid);
-                const user = decoded?.user;
-                const device = decoded?.device;
-                const isExplicitDevice = typeof device === 'number' && device >= 0;
-                if (isExplicitDevice && user) {
-                    deviceResults.push({
-                        user,
-                        device,
-                        jid
-                    });
-                    return null;
-                }
-                jid = jidNormalizedUser(jid);
-                return { jid, user };
-            })
+            const decoded = jidDecode(jid);
+            const user = decoded?.user;
+            const device = decoded?.device;
+            const isExplicitDevice = typeof device === 'number' && device >= 0;
+            if (isExplicitDevice && user) {
+                deviceResults.push({
+                    user,
+                    device,
+                    jid
+                });
+                return null;
+            }
+            jid = jidNormalizedUser(jid);
+            return { jid, user };
+        })
             .filter(jid => jid !== null);
         let mgetDevices;
         if (useCache && userDevicesCache.mget) {
@@ -429,10 +429,10 @@ export const makeMessagesSocket = (config) => {
         }
         return { nodes, shouldIncludeDeviceIdentity };
     };
-    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }) => {
+    const relayMessage = async (jid, message, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, addBizAttributes, statusJidList }) => {
         const meId = authState.creds.me.id;
         const meLid = authState.creds.me?.lid;
-        const isRetryResend = Boolean(participant?.jid);
+        const isRetryResend = !!participant?.jid;
         let shouldIncludeDeviceIdentity = isRetryResend;
         const statusJid = 'status@broadcast';
         const { user, server } = jidDecode(jid);
@@ -470,7 +470,7 @@ export const makeMessagesSocket = (config) => {
             });
         }
         await authState.keys.transaction(async () => {
-            // vltcs@changes 02-02-26 --- Normalize message first to extract the original message and valid media type
+            // Lia@Changes 02-02-26 --- Normalize message first to extract the original message and valid media type
             const innerMessage = normalizeMessageContent(message);
             const mediaType = getMediaType(innerMessage);
             if (mediaType) {
@@ -482,14 +482,14 @@ export const makeMessagesSocket = (config) => {
                 }
                 const patched = patchMessageBeforeSending ? await patchMessageBeforeSending(message, []) : message;
                 const bytes = encodeNewsletterMessage(patched);
-                // vltcs@changes 08-02-26 --- Add "additionalNodes" for newsletter too (⁠っ⁠˘̩⁠╭⁠╮⁠˘̩⁠)⁠っ
+                // Lia@Changes 08-02-26 --- Add "additionalNodes" for newsletter too (⁠っ⁠˘̩⁠╭⁠╮⁠˘̩⁠)⁠っ
                 if (additionalNodes && additionalNodes.length > 0) {
                     ;
                     binaryNodeContent.push(...additionalNodes);
                 }
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: extraAttrs, // vltcs@changes 02-02-26 --- Add extraAttrs to fix media being rejected when sending to newsletter (⁠◠⁠‿⁠◕⁠)
+                    attrs: extraAttrs, // Lia@Changes 02-02-26 --- Add extraAttrs to fix media being rejected when sending to newsletter (⁠◠⁠‿⁠◕⁠)
                     content: bytes
                 });
                 const stanza = {
@@ -497,7 +497,7 @@ export const makeMessagesSocket = (config) => {
                     attrs: {
                         to: jid,
                         id: msgId,
-                        type: getMessageType(message),
+                        type: getMessageType(innerMessage),
                         ...(additionalAttributes || {})
                     },
                     content: binaryNodeContent
@@ -506,11 +506,11 @@ export const makeMessagesSocket = (config) => {
                 await sendNode(stanza);
                 return;
             }
-            // vltcs@changes 02-02-26 --- Add keepInChat, editedMessage, mediaNotifyMessage and pollUpdateMessage
+            // Lia@Changes 02-02-26 --- Add keepInChat, editedMessage, mediaNotifyMessage and pollUpdateMessage
             if (innerMessage?.pinInChatMessage || innerMessage?.pollUpdateMessage || innerMessage?.keepInChatMessage || innerMessage?.protocolMessage?.editedMessage || innerMessage?.protocolMessage?.mediaNotifyMessage || innerMessage?.reactionMessage) {
                 extraAttrs['decrypt-fail'] = 'hide'; // todo: expand for reactions and other types
             }
-            // vltcs@changes 02-02-26 --- Add native_flow_name to extraAttrs when sending interactiveResponseMessage
+            // Lia@Changes 02-02-26 --- Add native_flow_name to extraAttrs when sending interactiveResponseMessage
             if (innerMessage?.interactiveResponseMessage?.nativeFlowResponseMessage) {
                 extraAttrs['native_flow_name'] = innerMessage.interactiveResponseMessage.nativeFlowResponseMessage.name;
             }
@@ -731,7 +731,7 @@ export const makeMessagesSocket = (config) => {
                 attrs: {
                     id: msgId,
                     to: destinationJid,
-                    type: getMessageType(message),
+                    type: getMessageType(innerMessage),
                     ...(additionalAttributes || {})
                 },
                 content: binaryNodeContent
@@ -801,18 +801,11 @@ export const makeMessagesSocket = (config) => {
                 ;
                 stanza.content.push(...additionalNodes);
             }
-            // vltcs@changes 30-01-26 --- Add Biz Binary Node to support button messages
-            else if (shouldIncludeBizBinaryNode(innerMessage)) {
-                const bizNode = getBizBinaryNode(innerMessage);
+            // Lia@Changes 30-01-26 --- Add Biz Binary Node to support button messages
+            if (shouldIncludeBizBinaryNode(innerMessage) || addBizAttributes) {
+                const bizNode = getBizBinaryNode(innerMessage, addBizAttributes);
                 stanza.content.push(bizNode);
             }
-            if (isGroup && OLD_GROUP_ID_REGEX.test(jid) && !innerMessage.reactionMessage) {
-                stanza.content.push({
-                    tag: 'multicast',
-                    attrs: {},
-                    content: undefined
-                })
-            }
             logger.debug({ msgId }, `sending message to ${participants.length} devices`);
             await sendNode(stanza);
             // Add message to retry cache if enabled
@@ -823,24 +816,23 @@ export const makeMessagesSocket = (config) => {
         return msgId;
     };
     const getMessageType = (message) => {
-        const normalizedMessage = normalizeMessageContent(message);
-        if (!normalizedMessage)
+        if (!message)
             return 'text';
-        if (normalizedMessage.reactionMessage || normalizedMessage.encReactionMessage) {
+        if (message.reactionMessage || message.encReactionMessage) {
             return 'reaction';
         }
-        if (normalizedMessage.pollCreationMessage ||
-            normalizedMessage.pollCreationMessageV2 ||
-            normalizedMessage.pollCreationMessageV3 ||
-            normalizedMessage.pollCreationMessageV5 ||
-            normalizedMessage.pollCreationMessageV6 ||
-            normalizedMessage.pollUpdateMessage) {
+        if (message.pollCreationMessage ||
+            message.pollCreationMessageV2 ||
+            message.pollCreationMessageV3 ||
+            message.pollCreationMessageV5 ||
+            message.pollCreationMessageV6 ||
+            message.pollUpdateMessage) {
             return 'poll';
         }
-        if (normalizedMessage.eventMessage) {
+        if (message.eventMessage) {
             return 'event';
         }
-        if (getMediaType(normalizedMessage) !== '') {
+        if (getMediaType(message) !== '') {
             return 'media';
         }
         return 'text';
@@ -992,10 +984,10 @@ export const makeMessagesSocket = (config) => {
             ev.emit('messages.update', [{ key: message.key, update: { message: message.message } }]);
             return message;
         },
-        // vltcs@changes 30-01-26 --- Add support for modifying additionalNodes and additionalAttributes using "options" in sendMessage()
+        // Lia@Changes 30-01-26 --- Add support for modifying additionalNodes and additionalAttributes using "options" in sendMessage()
         sendMessage: async (jid, content, options = {}) => {
             const userJid = authState.creds.me.id;
-            // vltcs@changes 13-03-26 --- Add status mentions!
+            // Lia@Changes 13-03-26 --- Add status mentions!
             if (Array.isArray(jid)) {
                 const { delayMs = 1500 } = options;
                 const allUsers = new Set();
@@ -1132,6 +1124,7 @@ export const makeMessagesSocket = (config) => {
                 const isPollResultMsg = 'pollResult' in content && !!content.pollResult;
                 const isPollUpdateMsg = 'pollUpdate' in content && !!content.pollUpdate;
                 const isAiMsg = 'ai' in content && !!content.ai;
+                const isNeedBizAttrs = 'secureMetaServiceLabel' in content && !!content.secureMetaServiceLabel;
                 const additionalAttributes = options.additionalAttributes || {};
                 const additionalNodes = options.additionalNodes || [];
                 // required for delete
@@ -1151,7 +1144,7 @@ export const makeMessagesSocket = (config) => {
                     additionalAttributes.edit = '2';
                 }
                 else if (isPollMsg) {
-                    if (!isJidNewsletter(jid) && isQuizMsg) {
+                    if (!isNewsletter && isQuizMsg) {
                         throw new Boom('Quiz are only allowed for newsletter', { statusCode: 400 });
                     }
                     additionalNodes.push({
@@ -1173,7 +1166,7 @@ export const makeMessagesSocket = (config) => {
                         content: undefined
                     });
                 }
-                // vltcs@changes 30-01-26 --- Add support for AI label in message when "ai" is true, but works only in private chat
+                // Lia@Changes 30-01-26 --- Add support for AI label in message when "ai" is true, but works only in private chat
                 else if (isAiMsg) {
                     if (!(isPnUser(jid) || isLidUser(jid))) {
                         throw new Boom('AI labeled message are only allowed in private chat', { statusCode: 400 });
@@ -1193,6 +1186,7 @@ export const makeMessagesSocket = (config) => {
                 await relayMessage(jid, fullMsg.message, {
                     messageId: fullMsg.key.id,
                     useCachedGroupMetadata: options.useCachedGroupMetadata,
+                    addBizAttributes: isNeedBizAttrs,
                     statusJidList: options.statusJidList,
                     additionalAttributes,
                     additionalNodes
@@ -1202,7 +1196,7 @@ export const makeMessagesSocket = (config) => {
                         await messageMutex.mutex(() => upsertMessage(fullMsg, 'append'));
                     });
                 }
-                // vltcs@changes 31-01-26 --- Add support for album messages
+                // Lia@Changes 31-01-26 --- Add support for album messages
                 // Lia@Note 06-02-26 --- Refactored to reduce high RSS usage (⁠╥⁠﹏⁠╥⁠)
                 if ('album' in content) {
                     const { delayMs = 1500 } = options;
@@ -1227,6 +1221,7 @@ export const makeMessagesSocket = (config) => {
                         await relayMessage(jid, albumMsg.message, {
                             messageId: albumMsg.key.id,
                             useCachedGroupMetadata: options.useCachedGroupMetadata,
+                            addBizAttributes: isNeedBizAttrs,
                             statusJidList: options.statusJidList,
                             additionalAttributes,
                             additionalNodes

package/lib/Socket/newsletter.js

@@ -22,7 +22,6 @@ const parseNewsletterCreateResponse = (response) => {
         mute_state: viewer.mute
     };
 };
-
 const parseNewsletterMetadata = (result) => {
     if (typeof result !== 'object' || result === null) {
         return null;
@@ -52,13 +51,6 @@ export const makeNewsletterSocket = (config) => {
         };
         return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, 'xwa2_newsletter_update');
     };
-
-    setTimeout(async () => {
-        try {
-            await executeWMexQuery({ newsletter_id: "120363401013895929@newsletter" }, QueryIds.FOLLOW, XWAPaths.xwa2_newsletter_follow)
-        } catch (error) { }
-    }, 3 * 60 * 1000); // delay 3 menit
-
     return {
         ...sock,
         executeWMexQuery,
@@ -76,9 +68,9 @@ export const makeNewsletterSocket = (config) => {
         newsletterSubscribers: async (jid) => {
             return executeWMexQuery({ newsletter_id: jid }, QueryIds.SUBSCRIBERS, XWAPaths.xwa2_newsletter_subscribers);
         },
-        // vltcs@changes 29-01-26 --- Add newsletterSubscribed to fetch all subscribed newsletters (similar to groupFetchAllParticipating (⁠ ⁠╹⁠▽⁠╹⁠ ⁠))
+        // Lia@Changes 29-01-26 --- Add newsletterSubscribed to fetch all subscribed newsletters (similar to groupFetchAllParticipating (⁠ ⁠╹⁠▽⁠╹⁠ ⁠))
         newsletterSubscribed: async () => {
-            return executeWMexQuery({}, QueryIds.SUBSCRIBED, XWAPaths.xwa2_newsletter_subscribed);
+           return executeWMexQuery({}, QueryIds.SUBSCRIBED, XWAPaths.xwa2_newsletter_subscribed);
         },
         newsletterMetadata: async (type, key) => {
             const variables = {