violetics 7.0.1-alpha → 7.0.2-alpha

package/lib/Utils/history.js

@@ -1,17 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHistoryMsg = exports.downloadAndProcessHistorySyncNotification = exports.processHistoryMessage = exports.downloadHistory = void 0;
-const util_1 = require("util");
-const zlib_1 = require("zlib");
-const WAProto_1 = require("../../WAProto");
-const Types_1 = require("../Types");
-const WABinary_1 = require("../WABinary");
-const generics_1 = require("./generics");
-const messages_1 = require("./messages");
-const messages_media_1 = require("./messages-media");
-const inflatePromise = (0, util_1.promisify)(zlib_1.inflate);
-const downloadHistory = async (msg, options) => {
-    const stream = await (0, messages_media_1.downloadContentFromMessage)(msg, 'md-msg-hist', { options });
+import { promisify } from 'util';
+import { inflate } from 'zlib';
+import { proto } from '../../WAProto/index.js';
+import { WAMessageStubType } from '../Types/index.js';
+import { isHostedLidUser, isHostedPnUser, isLidUser, isPnUser } from '../WABinary/index.js';
+import { toNumber } from './generics.js';
+import { normalizeMessageContent } from './messages.js';
+import { downloadContentFromMessage } from './messages-media.js';
+const inflatePromise = promisify(inflate);
+const extractPnFromMessages = (messages) => {
+    for (const msgItem of messages) {
+        const message = msgItem.message;
+        // Only extract from outgoing messages (fromMe: true) in 1:1 chats
+        // because userReceipt.userJid is the recipient's JID
+        if (!message?.key?.fromMe || !message.userReceipt?.length) {
+            continue;
+        }
+        const userJid = message.userReceipt[0]?.userJid;
+        if (userJid && (isPnUser(userJid) || isHostedPnUser(userJid))) {
+            return userJid;
+        }
+    }
+    return undefined;
+};
+export const downloadHistory = async (msg, options) => {
+    const stream = await downloadContentFromMessage(msg, 'md-msg-hist', { options });
     const bufferArray = [];
     for await (const chunk of stream) {
         bufferArray.push(chunk);
@@ -19,57 +31,74 @@ const downloadHistory = async (msg, options) => {
     let buffer = Buffer.concat(bufferArray);
     // decompress buffer
     buffer = await inflatePromise(buffer);
-    const syncData = WAProto_1.proto.HistorySync.decode(buffer);
+    const syncData = proto.HistorySync.decode(buffer);
     return syncData;
 };
-exports.downloadHistory = downloadHistory;
-const processHistoryMessage = (item) => {
-    var _a, _b, _c;
+export const processHistoryMessage = (item, logger) => {
     const messages = [];
     const contacts = [];
     const chats = [];
+    const lidPnMappings = [];
+    logger?.trace({ progress: item.progress }, 'processing history of type ' + item.syncType?.toString());
+    // Extract LID-PN mappings for all sync types
+    for (const m of item.phoneNumberToLidMappings || []) {
+        if (m.lidJid && m.pnJid) {
+            lidPnMappings.push({ lid: m.lidJid, pn: m.pnJid });
+        }
+    }
     switch (item.syncType) {
-        case WAProto_1.proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
-        case WAProto_1.proto.HistorySync.HistorySyncType.RECENT:
-        case WAProto_1.proto.HistorySync.HistorySyncType.FULL:
+        case proto.HistorySync.HistorySyncType.INITIAL_BOOTSTRAP:
+        case proto.HistorySync.HistorySyncType.RECENT:
+        case proto.HistorySync.HistorySyncType.FULL:
+        case proto.HistorySync.HistorySyncType.ON_DEMAND:
             for (const chat of item.conversations) {
-                contacts.push({ 
+                contacts.push({
                     id: chat.id,
-                    name: chat.name || undefined,
-                    lid: chat.lidJid || undefined,
-                    jid: (0, WABinary_1.isJidUser)(chat.id) ? chat.id : undefined
+                    name: chat.displayName || chat.name || chat.username || undefined,
+                    lid: chat.lidJid || chat.accountLid || undefined,
+                    phoneNumber: chat.pnJid || undefined
                 });
+                const chatId = chat.id;
+                const isLid = isLidUser(chatId) || isHostedLidUser(chatId);
+                const isPn = isPnUser(chatId) || isHostedPnUser(chatId);
+                if (isLid && chat.pnJid) {
+                    lidPnMappings.push({ lid: chatId, pn: chat.pnJid });
+                }
+                else if (isPn && chat.lidJid) {
+                    lidPnMappings.push({ lid: chat.lidJid, pn: chatId });
+                }
+                else if (isLid && !chat.pnJid) {
+                    // Fallback: extract PN from userReceipt in messages when pnJid is missing
+                    const pnFromReceipt = extractPnFromMessages(chat.messages || []);
+                    if (pnFromReceipt) {
+                        lidPnMappings.push({ lid: chatId, pn: pnFromReceipt });
+                    }
+                }
                 const msgs = chat.messages || [];
                 delete chat.messages;
-                delete chat.archived;
-                delete chat.muteEndTime;
-                delete chat.pinned;
                 for (const item of msgs) {
                     const message = item.message;
                     messages.push(message);
-                    if (!((_a = chat.messages) === null || _a === void 0 ? void 0 : _a.length)) {
+                    if (!chat.messages?.length) {
                         // keep only the most recent message in the chat array
                         chat.messages = [{ message }];
                     }
                     if (!message.key.fromMe && !chat.lastMessageRecvTimestamp) {
-                        chat.lastMessageRecvTimestamp = (0, generics_1.toNumber)(message.messageTimestamp);
+                        chat.lastMessageRecvTimestamp = toNumber(message.messageTimestamp);
                     }
-                    if ((message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP
-                        || message.messageStubType === Types_1.WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB)
-                        && ((_b = message.messageStubParameters) === null || _b === void 0 ? void 0 : _b[0])) {
+                    if ((message.messageStubType === WAMessageStubType.BIZ_PRIVACY_MODE_TO_BSP ||
+                        message.messageStubType === WAMessageStubType.BIZ_PRIVACY_MODE_TO_FB) &&
+                        message.messageStubParameters?.[0]) {
                         contacts.push({
                             id: message.key.participant || message.key.remoteJid,
-                            verifiedName: (_c = message.messageStubParameters) === null || _c === void 0 ? void 0 : _c[0],
+                            verifiedName: message.messageStubParameters?.[0]
                         });
                     }
                 }
-                if ((0, WABinary_1.isJidUser)(chat.id) && chat.readOnly && chat.archived) {
-                    delete chat.readOnly;
-                }
                 chats.push({ ...chat });
             }
             break;
-        case WAProto_1.proto.HistorySync.HistorySyncType.PUSH_NAME:
+        case proto.HistorySync.HistorySyncType.PUSH_NAME:
             for (const c of item.pushnames) {
                 contacts.push({ id: c.id, notify: c.pushname });
             }
@@ -79,18 +108,23 @@ const processHistoryMessage = (item) => {
         chats,
         contacts,
         messages,
+        lidPnMappings,
+        syncType: item.syncType,
+        progress: item.progress
     };
 };
-exports.processHistoryMessage = processHistoryMessage;
-const downloadAndProcessHistorySyncNotification = async (msg, options) => {
-    const historyMsg = await (0, exports.downloadHistory)(msg, options);
-    return (0, exports.processHistoryMessage)(historyMsg);
+export const downloadAndProcessHistorySyncNotification = async (msg, options, logger) => {
+    let historyMsg;
+    if (msg.initialHistBootstrapInlinePayload) {
+        historyMsg = proto.HistorySync.decode(await inflatePromise(msg.initialHistBootstrapInlinePayload));
+    }
+    else {
+        historyMsg = await downloadHistory(msg, options);
+    }
+    return processHistoryMessage(historyMsg, logger);
 };
-exports.downloadAndProcessHistorySyncNotification = downloadAndProcessHistorySyncNotification;
-const getHistoryMsg = (message) => {
-    var _a;
-    const normalizedContent = !!message ? (0, messages_1.normalizeMessageContent)(message) : undefined;
-    const anyHistoryMsg = (_a = normalizedContent === null || normalizedContent === void 0 ? void 0 : normalizedContent.protocolMessage) === null || _a === void 0 ? void 0 : _a.historySyncNotification;
+export const getHistoryMsg = (message) => {
+    const normalizedContent = !!message ? normalizeMessageContent(message) : undefined;
+    const anyHistoryMsg = normalizedContent?.protocolMessage?.historySyncNotification;
     return anyHistoryMsg;
-};
-exports.getHistoryMsg = getHistoryMsg;
+};

package/lib/Utils/identity-change-handler.js

@@ -0,0 +1,48 @@
+import NodeCache from '@cacheable/node-cache';
+import { areJidsSameUser, getBinaryNodeChild, jidDecode } from '../WABinary/index.js';
+import { isStringNullOrEmpty } from './generics.js';
+export async function handleIdentityChange(node, ctx) {
+    const from = node.attrs.from;
+    if (!from) {
+        return { action: 'invalid_notification' };
+    }
+    const identityNode = getBinaryNodeChild(node, 'identity');
+    if (!identityNode) {
+        return { action: 'no_identity_node' };
+    }
+    ctx.logger.info({ jid: from }, 'identity changed');
+    const decoded = jidDecode(from);
+    if (decoded?.device && decoded.device !== 0) {
+        ctx.logger.debug({ jid: from, device: decoded.device }, 'ignoring identity change from companion device');
+        return { action: 'skipped_companion_device', device: decoded.device };
+    }
+    const isSelfPrimary = ctx.meId && (areJidsSameUser(from, ctx.meId) || (ctx.meLid && areJidsSameUser(from, ctx.meLid)));
+    if (isSelfPrimary) {
+        ctx.logger.info({ jid: from }, 'self primary identity changed');
+        return { action: 'skipped_self_primary' };
+    }
+    if (ctx.debounceCache.get(from)) {
+        ctx.logger.debug({ jid: from }, 'skipping identity assert (debounced)');
+        return { action: 'debounced' };
+    }
+    ctx.debounceCache.set(from, true);
+    const isOfflineNotification = !isStringNullOrEmpty(node.attrs.offline);
+    const hasExistingSession = await ctx.validateSession(from);
+    if (!hasExistingSession.exists) {
+        ctx.logger.debug({ jid: from }, 'no old session, skipping session refresh');
+        return { action: 'skipped_no_session' };
+    }
+    ctx.logger.debug({ jid: from }, 'old session exists, will refresh session');
+    if (isOfflineNotification) {
+        ctx.logger.debug({ jid: from }, 'skipping session refresh during offline processing');
+        return { action: 'skipped_offline' };
+    }
+    try {
+        await ctx.assertSessions([from], true);
+        return { action: 'session_refreshed' };
+    }
+    catch (error) {
+        ctx.logger.warn({ error, jid: from }, 'failed to assert sessions after identity change');
+        return { action: 'session_refresh_failed', error };
+    }
+}

package/lib/Utils/index.js

@@ -1,33 +1,19 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./generics"), exports);
-__exportStar(require("./decode-wa-message"), exports);
-__exportStar(require("./messages"), exports);
-__exportStar(require("./messages-media"), exports);
-__exportStar(require("./validate-connection"), exports);
-__exportStar(require("./crypto"), exports);
-__exportStar(require("./signal"), exports);
-__exportStar(require("./noise-handler"), exports);
-__exportStar(require("./history"), exports);
-__exportStar(require("./chat-utils"), exports);
-__exportStar(require("./lt-hash"), exports);
-__exportStar(require("./auth-utils"), exports);
-__exportStar(require("./baileys-event-stream"), exports);
-__exportStar(require("./use-multi-file-auth-state"), exports);
-__exportStar(require("./link-preview"), exports);
-__exportStar(require("./event-buffer"), exports);
-__exportStar(require("./process-message"), exports);
+export * from './generics.js';
+export * from './decode-wa-message.js';
+export * from './messages.js';
+export * from './messages-media.js';
+export * from './validate-connection.js';
+export * from './crypto.js';
+export * from './signal.js';
+export * from './noise-handler.js';
+export * from './history.js';
+export * from './chat-utils.js';
+export * from './lt-hash.js';
+export * from './auth-utils.js';
+export * from './use-multi-file-auth-state.js';
+export * from './link-preview.js';
+export * from './event-buffer.js';
+export * from './process-message.js';
+export * from './message-retry-manager.js';
+export * from './browser-utils.js';
+export * from './identity-change-handler.js';

package/lib/Utils/link-preview.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUrlInfo = void 0;
-const messages_1 = require("./messages");
-const messages_media_1 = require("./messages-media");
+import { prepareWAMessageMedia } from './messages.js';
+import { extractImageThumb, getHttpStream } from './messages-media.js';
 const THUMBNAIL_WIDTH_PX = 192;
 /** Fetches an image and generates a thumbnail for it */
 const getCompressedJpegThumbnail = async (url, { thumbnailWidth, fetchOpts }) => {
-    const stream = await (0, messages_media_1.getHttpStream)(url, fetchOpts);
-    const result = await (0, messages_media_1.extractImageThumb)(stream, thumbnailWidth);
+    const stream = await getHttpStream(url, fetchOpts);
+    const result = await extractImageThumb(stream, thumbnailWidth);
     return result;
 };
 /**
@@ -16,11 +13,10 @@ const getCompressedJpegThumbnail = async (url, { thumbnailWidth, fetchOpts }) =>
  * @param text first matched URL in text
  * @returns the URL info required to generate link preview
  */
-const getUrlInfo = async (text, opts = {
+export const getUrlInfo = async (text, opts = {
     thumbnailWidth: THUMBNAIL_WIDTH_PX,
     fetchOpts: { timeout: 3000 }
 }) => {
-    var _a;
     try {
         // retries
         const retries = 0;
@@ -39,9 +35,9 @@ const getUrlInfo = async (text, opts = {
                 if (retries >= maxRetry) {
                     return false;
                 }
-                if (forwardedURLObj.hostname === urlObj.hostname
-                    || forwardedURLObj.hostname === 'www.' + urlObj.hostname
-                    || 'www.' + forwardedURLObj.hostname === urlObj.hostname) {
+                if (forwardedURLObj.hostname === urlObj.hostname ||
+                    forwardedURLObj.hostname === 'www.' + urlObj.hostname ||
+                    'www.' + forwardedURLObj.hostname === urlObj.hostname) {
                     retries + 1;
                     return true;
                 }
@@ -49,7 +45,7 @@ const getUrlInfo = async (text, opts = {
                     return false;
                 }
             },
-            headers: opts.fetchOpts
+            headers: opts.fetchOpts?.headers
         });
         if (info && 'title' in info && info.title) {
             const [image] = info.images;
@@ -61,24 +57,20 @@ const getUrlInfo = async (text, opts = {
                 originalThumbnailUrl: image
             };
             if (opts.uploadImage) {
-                const { imageMessage } = await (0, messages_1.prepareWAMessageMedia)({ image: { url: image } }, {
+                const { imageMessage } = await prepareWAMessageMedia({ image: { url: image } }, {
                     upload: opts.uploadImage,
                     mediaTypeOverride: 'thumbnail-link',
                     options: opts.fetchOpts
                 });
-                urlInfo.jpegThumbnail = (imageMessage === null || imageMessage === void 0 ? void 0 : imageMessage.jpegThumbnail)
-                    ? Buffer.from(imageMessage.jpegThumbnail)
-                    : undefined;
+                urlInfo.jpegThumbnail = imageMessage?.jpegThumbnail ? Buffer.from(imageMessage.jpegThumbnail) : undefined;
                 urlInfo.highQualityThumbnail = imageMessage || undefined;
             }
             else {
                 try {
-                    urlInfo.jpegThumbnail = image
-                        ? (await getCompressedJpegThumbnail(image, opts)).buffer
-                        : undefined;
+                    urlInfo.jpegThumbnail = image ? (await getCompressedJpegThumbnail(image, opts)).buffer : undefined;
                 }
                 catch (error) {
-                    (_a = opts.logger) === null || _a === void 0 ? void 0 : _a.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail');
+                    opts.logger?.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail');
                 }
             }
             return urlInfo;
@@ -89,5 +81,4 @@ const getUrlInfo = async (text, opts = {
             throw error;
         }
     }
-};
-exports.getUrlInfo = getUrlInfo;
+};

package/lib/Utils/logger.js

@@ -1,7 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const pino_1 = __importDefault(require("pino"));
-exports.default = (0, pino_1.default)({ timestamp: () => `,"time":"${new Date().toJSON()}"` });
+import P from 'pino';
+export default P({ timestamp: () => `,"time":"${new Date().toJSON()}"` });

package/lib/Utils/lt-hash.js

@@ -1,51 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LT_HASH_ANTI_TAMPERING = void 0;
-const crypto_1 = require("./crypto");
+import { LTHashAntiTampering } from 'whatsapp-rust-bridge';
 /**
  * LT Hash is a summation based hash algorithm that maintains the integrity of a piece of data
  * over a series of mutations. You can add/remove mutations and it'll return a hash equal to
  * if the same series of mutations was made sequentially.
  */
-const o = 128;
-class d {
-    constructor(e) {
-        this.salt = e;
-    }
-    add(e, t) {
-        var r = this;
-        for (const item of t) {
-            e = r._addSingle(e, item);
-        }
-        return e;
-    }
-    subtract(e, t) {
-        var r = this;
-        for (const item of t) {
-            e = r._subtractSingle(e, item);
-        }
-        return e;
-    }
-    subtractThenAdd(e, t, r) {
-        var n = this;
-        return n.add(n.subtract(e, r), t);
-    }
-    _addSingle(e, t) {
-        var r = this;
-        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(e, n, ((e, t) => e + t));
-    }
-    _subtractSingle(e, t) {
-        var r = this;
-        const n = new Uint8Array((0, crypto_1.hkdf)(Buffer.from(t), o, { info: r.salt })).buffer;
-        return r.performPointwiseWithOverflow(e, n, ((e, t) => e - t));
-    }
-    performPointwiseWithOverflow(e, t, r) {
-        const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a);
-        for (let e = 0; e < n.byteLength; e += 2) {
-            s.setUint16(e, r(n.getUint16(e, !0), i.getUint16(e, !0)), !0);
-        }
-        return a;
-    }
-}
-exports.LT_HASH_ANTI_TAMPERING = new d('WhatsApp Patch Integrity');
+export const LT_HASH_ANTI_TAMPERING = new LTHashAntiTampering();

package/lib/Utils/make-mutex.js

@@ -1,55 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeKeyedMutex = exports.makeMutex = void 0;
-/**
- * Creates a mutex that processes tasks sequentially.
- * @param taskTimeoutMs max time (ms) a single task may run before being forcefully
- *   rejected to unblock the queue. Default: 30 000 ms.
- */
-const makeMutex = (taskTimeoutMs = 30000) => {
-    let task = Promise.resolve();
+import { Mutex as AsyncMutex } from 'async-mutex';
+export const makeMutex = () => {
+    const mutex = new AsyncMutex();
     return {
         mutex(code) {
-            task = (async () => {
-                // wait for the previous task to complete
-                // if there is an error, we swallow so as to not block the queue
-                try {
-                    await task;
-                }
-                catch (_a) { }
-                // run current task with a timeout guard so a single hung task
-                // (e.g. a stalled WA query) never freezes the whole processing queue
-                let timeoutHandle;
-                const timeoutPromise = new Promise((_resolve, reject) => {
-                    timeoutHandle = setTimeout(
-                        () => reject(new Error(`makeMutex: task timed out after ${taskTimeoutMs}ms`)),
-                        taskTimeoutMs
-                    );
-                });
-                try {
-                    const result = await Promise.race([code(), timeoutPromise]);
-                    return result;
-                }
-                finally {
-                    clearTimeout(timeoutHandle);
-                }
-            })();
-            // we replace the existing task, appending the new piece of execution to it
-            // so the next task will have to wait for this one to finish
-            return task;
-        },
+            return mutex.runExclusive(code);
+        }
     };
 };
-exports.makeMutex = makeMutex;
-const makeKeyedMutex = () => {
-    const map = {};
+export const makeKeyedMutex = () => {
+    const map = new Map();
     return {
-        mutex(key, task) {
-            if (!map[key]) {
-                map[key] = (0, exports.makeMutex)();
+        async mutex(key, task) {
+            let entry = map.get(key);
+            if (!entry) {
+                entry = { mutex: new AsyncMutex(), refCount: 0 };
+                map.set(key, entry);
+            }
+            entry.refCount++;
+            try {
+                return await entry.mutex.runExclusive(task);
+            }
+            finally {
+                entry.refCount--;
+                // only delete it if this is still the current entry
+                if (entry.refCount === 0 && map.get(key) === entry) {
+                    map.delete(key);
+                }
             }
-            return map[key].mutex(task);
         }
     };
-};
-exports.makeKeyedMutex = makeKeyedMutex;
+};