@langitdeveloper/baileys 2.1.0 → 2.1.1

package/lib/Signal/lid-mapping.js

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { LRUCache } = require("lru-cache");
+const {
+    isHostedPnUser,
+    isLidUser,
+    isPnUser,
+    jidDecode,
+    jidNormalizedUser,
+    WAJIDDomains,
+} = require("../WABinary");
+/**
+ * Keeps a persistent + in-memory mapping between PN (phone number) jids and
+ * LID jids. Needed because newer WhatsApp clients can address the same user
+ * via either identifier, and signal sessions are tied to one or the other.
+ */
+class LIDMappingStore {
+    constructor(keys, logger, pnToLIDFunc) {
+        this.mappingCache = new LRUCache({
+            ttl: 3 * 24 * 60 * 60 * 1e3,
+            ttlAutopurge: true,
+            updateAgeOnGet: true,
+        });
+        this.keys = keys;
+        this.pnToLIDFunc = pnToLIDFunc;
+        this.logger = logger;
+    }
+    async storeLIDPNMappings(pairs) {
+        const pairMap = {};
+        for (const { lid, pn } of pairs) {
+            if (!((isLidUser(lid) && isPnUser(pn)) || (isPnUser(lid) && isLidUser(pn)))) {
+                this.logger.warn(`Invalid LID-PN mapping: ${lid}, ${pn}`);
+                continue;
+            }
+            const lidDecoded = jidDecode(lid);
+            const pnDecoded = jidDecode(pn);
+            if (!lidDecoded || !pnDecoded) return;
+            const pnUser = pnDecoded.user;
+            const lidUser = lidDecoded.user;
+            let existingLidUser = this.mappingCache.get(`pn:${pnUser}`);
+            if (!existingLidUser) {
+                this.logger.trace(`Cache miss for PN user ${pnUser}; checking database`);
+                const stored = await this.keys.get("lid-mapping", [pnUser]);
+                existingLidUser = stored[pnUser];
+                if (existingLidUser) {
+                    this.mappingCache.set(`pn:${pnUser}`, existingLidUser);
+                    this.mappingCache.set(`lid:${existingLidUser}`, pnUser);
+                }
+            }
+            if (existingLidUser === lidUser) {
+                this.logger.debug(
+                    { pnUser, lidUser },
+                    "LID mapping already exists, skipping"
+                );
+                continue;
+            }
+            pairMap[pnUser] = lidUser;
+        }
+        this.logger.trace(
+            { pairMap },
+            `Storing ${Object.keys(pairMap).length} pn mappings`
+        );
+        await this.keys.transaction(async () => {
+            for (const [pnUser, lidUser] of Object.entries(pairMap)) {
+                await this.keys.set({
+                    "lid-mapping": { [pnUser]: lidUser, [`${lidUser}_reverse`]: pnUser },
+                });
+                this.mappingCache.set(`pn:${pnUser}`, lidUser);
+                this.mappingCache.set(`lid:${lidUser}`, pnUser);
+            }
+        }, "lid-mapping");
+    }
+    async getLIDForPN(pn) {
+        return (await this.getLIDsForPNs([pn]))?.[0]?.lid || null;
+    }
+    async getLIDsForPNs(pns) {
+        const usyncFetch = {};
+        const successfulPairs = {};
+        for (const pn of pns) {
+            if (!isPnUser(pn) && !isHostedPnUser(pn)) continue;
+            const decoded = jidDecode(pn);
+            if (!decoded) continue;
+            const pnUser = decoded.user;
+            let lidUser = this.mappingCache.get(`pn:${pnUser}`);
+            if (!lidUser) {
+                const stored = await this.keys.get("lid-mapping", [pnUser]);
+                lidUser = stored[pnUser];
+                if (lidUser) {
+                    this.mappingCache.set(`pn:${pnUser}`, lidUser);
+                    this.mappingCache.set(`lid:${lidUser}`, pnUser);
+                } else {
+                    this.logger.trace(
+                        `No LID mapping found for PN user ${pnUser}; batch getting from USync`
+                    );
+                    const device = decoded.device || 0;
+                    let normalizedPn = jidNormalizedUser(pn);
+                    if (isHostedPnUser(normalizedPn)) {
+                        normalizedPn = `${pnUser}@s.whatsapp.net`;
+                    }
+                    if (!usyncFetch[normalizedPn]) {
+                        usyncFetch[normalizedPn] = [device];
+                    } else {
+                        usyncFetch[normalizedPn]?.push(device);
+                    }
+                    continue;
+                }
+            }
+            lidUser = lidUser.toString();
+            if (!lidUser) {
+                this.logger.warn(`Invalid or empty LID user for PN ${pn}: lidUser = "${lidUser}"`);
+                return null;
+            }
+            const pnDevice = decoded.device !== undefined ? decoded.device : 0;
+            const deviceSpecificLid = `${lidUser}${!!pnDevice ? `:${pnDevice}` : ``}@${decoded.domainType === WAJIDDomains.HOSTED ? "hosted.lid" : "lid"}`;
+            this.logger.trace(
+                `getLIDForPN: ${pn} → ${deviceSpecificLid} (user mapping with device ${pnDevice})`
+            );
+            successfulPairs[pn] = { lid: deviceSpecificLid, pn };
+        }
+        if (Object.keys(usyncFetch).length > 0) {
+            const result = await this.pnToLIDFunc?.(Object.keys(usyncFetch));
+            if (result && result.length > 0) {
+                await this.storeLIDPNMappings(result);
+                for (const pair of result) {
+                    const pnDecoded = jidDecode(pair.pn);
+                    const pnUser = pnDecoded?.user;
+                    if (!pnUser) continue;
+                    const lidUser = jidDecode(pair.lid)?.user;
+                    if (!lidUser) continue;
+                    for (const device of usyncFetch[pair.pn]) {
+                        const deviceSpecificLid = `${lidUser}${!!device ? `:${device}` : ``}@${device === 99 ? "hosted.lid" : "lid"}`;
+                        this.logger.trace(
+                            `getLIDForPN: USYNC success for ${pair.pn} → ${deviceSpecificLid} (user mapping with device ${device})`
+                        );
+                        const deviceSpecificPn = `${pnUser}${!!device ? `:${device}` : ``}@${device === 99 ? "hosted" : "s.whatsapp.net"}`;
+                        successfulPairs[deviceSpecificPn] = {
+                            lid: deviceSpecificLid,
+                            pn: deviceSpecificPn,
+                        };
+                    }
+                }
+            } else {
+                return null;
+            }
+        }
+        return Object.values(successfulPairs);
+    }
+    async getPNForLID(lid) {
+        if (!isLidUser(lid)) return null;
+        const decoded = jidDecode(lid);
+        if (!decoded) return null;
+        const lidUser = decoded.user;
+        let pnUser = this.mappingCache.get(`lid:${lidUser}`);
+        if (!pnUser || typeof pnUser !== "string") {
+            const stored = await this.keys.get("lid-mapping", [`${lidUser}_reverse`]);
+            pnUser = stored[`${lidUser}_reverse`];
+            if (!pnUser || typeof pnUser !== "string") {
+                this.logger.trace(`No reverse mapping found for LID user: ${lidUser}`);
+                return null;
+            }
+            this.mappingCache.set(`lid:${lidUser}`, pnUser);
+        }
+        const lidDevice = decoded.device !== undefined ? decoded.device : 0;
+        const pnJid = `${pnUser}:${lidDevice}@${decoded.domainType === WAJIDDomains.HOSTED_LID ? "hosted" : "s.whatsapp.net"}`;
+        this.logger.trace(`Found reverse mapping: ${lid} → ${pnJid}`);
+        return pnJid;
+    }
+}
+module.exports = { LIDMappingStore };

package/lib/WABinary/jid-utils.js

@@ -1,11 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jidNormalizedUser = exports.isJidNewsLetter = exports.isJidStatusBroadcast = exports.isJidGroup = exports.isJidBroadcast = exports.isLidUser = exports.isJidUser = exports.areJidsSameUser = exports.jidDecode = exports.jidEncode = exports.STORIES_JID = exports.PSA_WID = exports.SERVER_JID = exports.OFFICIAL_BIZ_JID = exports.S_WHATSAPP_NET = void 0;
+exports.isPnUser = exports.isHostedPnUser = exports.isHostedLidUser = exports.WAJIDDomains = exports.getServerFromDomainType = exports.transferDevice = void 0;
 exports.S_WHATSAPP_NET = '@s.whatsapp.net';
 exports.OFFICIAL_BIZ_JID = '16505361212@c.us';
 exports.SERVER_JID = 'server@c.us';
 exports.PSA_WID = '0@c.us';
 exports.STORIES_JID = 'status@broadcast';
+/** numeric domain-type codes used by newer WA clients for lid/hosted accounts */
+const WAJIDDomains = { WHATSAPP: 0, LID: 1, HOSTED: 128, HOSTED_LID: 129 };
+exports.WAJIDDomains = WAJIDDomains;
+const getServerFromDomainType = (initialServer, domainType) => {
+    switch (domainType) {
+        case WAJIDDomains.LID:
+            return 'lid';
+        case WAJIDDomains.HOSTED:
+            return 'hosted';
+        case WAJIDDomains.HOSTED_LID:
+            return 'hosted.lid';
+        case WAJIDDomains.WHATSAPP:
+        default:
+            return initialServer;
+    }
+};
+exports.getServerFromDomainType = getServerFromDomainType;
 const jidEncode = (user, server, device, agent) => {
     return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`;
 };
@@ -19,14 +37,30 @@ const jidDecode = (jid) => {
     const userCombined = jid.slice(0, sepIdx);
     const [userAgent, device] = userCombined.split(':');
     const user = userAgent.split('_')[0];
+    let domainType = WAJIDDomains.WHATSAPP;
+    if (server === 'lid') {
+        domainType = WAJIDDomains.LID;
+    } else if (server === 'hosted') {
+        domainType = WAJIDDomains.HOSTED;
+    } else if (server === 'hosted.lid') {
+        domainType = WAJIDDomains.HOSTED_LID;
+    }
     return {
         server,
         user,
-        domainType: server === 'lid' ? 1 : 0,
+        domainType,
         device: device ? +device : undefined
     };
 };
 exports.jidDecode = jidDecode;
+/** transfers the device id from one jid onto another (used during lid<->pn swaps) */
+const transferDevice = (fromJid, toJid) => {
+    const fromDecoded = jidDecode(fromJid);
+    const deviceId = (fromDecoded && fromDecoded.device) || 0;
+    const toDecoded = jidDecode(toJid);
+    return jidEncode(toDecoded.user, toDecoded.server, deviceId);
+};
+exports.transferDevice = transferDevice;
 /** is the jid a user */
 const areJidsSameUser = (jid1, jid2) => {
     var _a, _b;
@@ -39,6 +73,15 @@ exports.isJidUser = isJidUser;
 /** is the jid a group */
 const isLidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@lid'));
 exports.isLidUser = isLidUser;
+/** is the jid a regular phone-number user (alias of isJidUser, used by lid-mapping) */
+const isPnUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@s.whatsapp.net'));
+exports.isPnUser = isPnUser;
+/** is the jid a "hosted" phone-number account */
+const isHostedPnUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@hosted'));
+exports.isHostedPnUser = isHostedPnUser;
+/** is the jid a "hosted" lid account */
+const isHostedLidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@hosted.lid'));
+exports.isHostedLidUser = isHostedLidUser;
 /** is the jid a broadcast */
 const isJidBroadcast = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@broadcast'));
 exports.isJidBroadcast = isJidBroadcast;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@langitdeveloper/baileys",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "WhatsApp API Modification By Langit",
     "keywords": [
         "whatsapp",