@pontalabs/baileys 1.0.6 → 1.0.7

package/lib/WABinary/jid-utils.js

@@ -1,96 +1,165 @@
-export const S_WHATSAPP_NET = '@s.whatsapp.net';
-export const OFFICIAL_BIZ_JID = '16505361212@c.us';
-export const SERVER_JID = 'server@c.us';
-export const PSA_WID = '0@c.us';
-export const STORIES_JID = 'status@broadcast';
-export const META_AI_JID = '13135550002@c.us';
-export var WAJIDDomains;
-(function (WAJIDDomains) {
-    WAJIDDomains[WAJIDDomains["WHATSAPP"] = 0] = "WHATSAPP";
-    WAJIDDomains[WAJIDDomains["LID"] = 1] = "LID";
-    WAJIDDomains[WAJIDDomains["HOSTED"] = 128] = "HOSTED";
-    WAJIDDomains[WAJIDDomains["HOSTED_LID"] = 129] = "HOSTED_LID";
-})(WAJIDDomains || (WAJIDDomains = {}));
-export 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;
-    }
-};
-export const jidEncode = (user, server, device, agent) => {
-    return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`;
-};
-export const jidDecode = (jid) => {
-    // todo: investigate how to implement hosted ids in this case
-    const sepIdx = typeof jid === 'string' ? jid.indexOf('@') : -1;
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const S_WHATSAPP_NET = '@s.whatsapp.net'
+
+const OFFICIAL_BIZ_JID = '16505361212@c.us'
+
+const SERVER_JID = 'server@c.us'
+
+const PSA_WID = '0@c.us'
+
+const STORIES_JID = 'status@broadcast'
+
+const META_AI_JID = '13135550002@c.us'
+
+const jidEncode = (user, server, device, agent) => {
+    return `${user || ''}${!!agent ? `_${agent}` : ''}${!!device ? `:${device}` : ''}@${server}`
+}
+
+const jidDecode = (jid) => {
+    const sepIdx = typeof jid === 'string' ? jid.indexOf('@') : -1
     if (sepIdx < 0) {
-        return undefined;
-    }
-    const server = jid.slice(sepIdx + 1);
-    const userCombined = jid.slice(0, sepIdx);
-    const [userAgent, device] = userCombined.split(':');
-    const [user, agent] = userAgent.split('_');
-    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;
-    }
-    else if (agent) {
-        domainType = parseInt(agent);
+        return undefined
     }
+    const server = jid.slice(sepIdx + 1)
+    const userCombined = jid.slice(0, sepIdx)
+    const [userAgent, device] = userCombined.split(':')
+    const user = userAgent.split('_')[0]
     return {
         server: server,
-        user: user,
-        domainType,
+        user,
+        domainType: server === 'lid' ? 1 : 0,
         device: device ? +device : undefined
-    };
-};
+    }
+}
+
 /** is the jid a user */
-export const areJidsSameUser = (jid1, jid2) => jidDecode(jid1)?.user === jidDecode(jid2)?.user;
+const areJidsSameUser = (jid1, jid2) => {
+    return jidDecode(jid1)?.user === jidDecode(jid2)?.user
+}
+
 /** is the jid Meta AI */
-export const isJidMetaAI = (jid) => jid?.endsWith('@bot');
-/** is the jid a PN user */
-export const isPnUser = (jid) => jid?.endsWith('@s.whatsapp.net');
-/** is the jid a LID */
-export const isLidUser = (jid) => jid?.endsWith('@lid');
+const isJidMetaAI = (jid) => jid?.endsWith('@bot')
+
+/** is the jid a user */
+const isJidUser = (jid) => jid?.endsWith('@s.whatsapp.net')
+
+/** is the lid a user */
+const isLidUser = (jid) => jid?.endsWith('@lid')
+
 /** is the jid a broadcast */
-export const isJidBroadcast = (jid) => jid?.endsWith('@broadcast');
+const isJidBroadcast = (jid) => jid?.endsWith('@broadcast')
+
 /** is the jid a group */
-export const isJidGroup = (jid) => jid?.endsWith('@g.us');
+const isJidGroup = (jid) => jid?.endsWith('@g.us')
+
 /** is the jid the status broadcast */
-export const isJidStatusBroadcast = (jid) => jid === 'status@broadcast';
+const isJidStatusBroadcast = (jid) => jid === 'status@broadcast'
+
 /** is the jid a newsletter */
-export const isJidNewsletter = (jid) => jid?.endsWith('@newsletter');
-/** is the jid a hosted PN */
-export const isHostedPnUser = (jid) => jid?.endsWith('@hosted');
-/** is the jid a hosted LID */
-export const isHostedLidUser = (jid) => jid?.endsWith('@hosted.lid');
-const botRegexp = /^1313555\d{4}$|^131655500\d{2}$/;
-export const isJidBot = (jid) => jid && botRegexp.test(jid.split('@')[0]) && jid.endsWith('@c.us');
-export const jidNormalizedUser = (jid) => {
-    const result = jidDecode(jid);
+const isJidNewsletter = (jid) => jid?.endsWith('@newsletter')
+
+/** is the jid a bot */
+const botRegexp = /^1313555\d{4}$|^131655500\d{2}$/
+const isJidBot = (jid) => (jid && botRegexp.test(jid.split('@')[0]) && jid.endsWith('@c.us'))
+
+const jidNormalizedUser = (jid) => {
+    const result = jidDecode(jid)
     if (!result) {
-        return '';
+        return ''
+    }
+    const { user, server } = result
+    return jidEncode(user, server === 'c.us' ? 's.whatsapp.net' : server)
+}
+
+const transferDevice = (fromJid, toJid) => {
+    const fromDecoded = jidDecode(fromJid)
+    const deviceId = fromDecoded?.device || 0
+    const { server, user } = jidDecode(toJid)
+    return jidEncode(user, server, deviceId)
+}
+
+module.exports = {
+  S_WHATSAPP_NET, 
+  OFFICIAL_BIZ_JID, 
+  SERVER_JID, 
+  PSA_WID, 
+  STORIES_JID, 
+  META_AI_JID, 
+  jidEncode, 
+  jidDecode, 
+  areJidsSameUser, 
+  isJidMetaAI, 
+  isJidUser, 
+  isLidUser, 
+  isJidBroadcast, 
+  isJidGroup, 
+  isJidStatusBroadcast, 
+  isJidNewsletter, 
+  isJidBot, 
+  transferDevice, 
+  jidNormalizedUser
+}
+// ============================================================
+// FIX: getSenderJid - helper aman untuk identifikasi pengirim
+// ============================================================
+/**
+ * Mendapatkan JID pengirim sebenarnya dari sebuah pesan.
+ * Aman digunakan untuk private chat maupun group.
+ *
+ * Cara pakai di bot:
+ *   const { getSenderJid, areJidsSameUser } = require('@whiskeysockets/baileys')
+ *   const sender = getSenderJid(msg)
+ *   if (areJidsSameUser(sender, ownerNumber)) { ... }
+ *
+ * @param {object} msg - objek WebMessageInfo dari event messages.upsert
+ * @returns {string} JID pengirim yang sudah dinormalisasi
+ */
+const getSenderJid = (msg) => {
+    const key = msg?.key
+    if (!key) return ''
+    // Pesan dari bot sendiri: remoteJid adalah lawan bicara
+    if (key.fromMe) return jidNormalizedUser(key.remoteJid)
+    // Group / broadcast: gunakan participant
+    if (isJidGroup(key.remoteJid) || isJidBroadcast(key.remoteJid)) {
+        return jidNormalizedUser(key.participant || key.remoteJid)
+    }
+    // Private chat: pengirim adalah remoteJid itu sendiri
+    return jidNormalizedUser(key.remoteJid)
+}
+
+exports.getSenderJid = getSenderJid
+
+// ============================================================
+// FIX: splitJidLid - normalisasi pasangan jid(pn) & lid
+// ============================================================
+/**
+ * Terima dua kandidat identitas (urutan bebas, boleh salah satunya kosong)
+ * dan pisahkan jadi { jid, lid } berdasarkan suffix domainnya, bukan
+ * berdasarkan posisi argumen. Dipakai di semua tempat yang membentuk
+ * pasangan participant/jid <-> lid (groups, community, message key)
+ * supaya hasilnya konsisten walau addressing_mode / urutan atribut beda.
+ *
+ * @param {string|undefined} a kandidat pertama
+ * @param {string|undefined} b kandidat kedua
+ * @returns {{ jid: string|undefined, lid: string|undefined }}
+ */
+const splitJidLid = (a, b) => {
+    let jid
+    let lid
+    if (a && isLidUser(a)) {
+        lid = a
+    } else if (a) {
+        jid = a
+    }
+    if (b && isLidUser(b)) {
+        lid = lid || b
+    } else if (b) {
+        jid = jid || b
     }
-    const { user, server } = result;
-    return jidEncode(user, server === 'c.us' ? 's.whatsapp.net' : server);
-};
-export const transferDevice = (fromJid, toJid) => {
-    const fromDecoded = jidDecode(fromJid);
-    const deviceId = fromDecoded?.device || 0;
-    const { server, user } = jidDecode(toJid);
-    return jidEncode(user, server, deviceId);
-};
-//# sourceMappingURL=jid-utils.js.map
+    return { jid, lid }
+}
+
+exports.splitJidLid = splitJidLid

package/lib/WABinary/types.d.ts

@@ -1,4 +1,5 @@
-import * as constants from './constants.js';
+import * as constants from './constants'
+
 /**
  * the binary node WA uses internally for communication
  *
@@ -7,13 +8,15 @@ import * as constants from './constants.js';
  * to maintain functional code structure
  * */
 export type BinaryNode = {
-    tag: string;
+    tag: string
     attrs: {
-        [key: string]: string;
-    };
-    content?: BinaryNode[] | string | Uint8Array;
-};
-export type BinaryNodeAttributes = BinaryNode['attrs'];
-export type BinaryNodeData = BinaryNode['content'];
-export type BinaryNodeCodingOptions = typeof constants;
-//# sourceMappingURL=types.d.ts.map
+        [key: string]: string
+    }
+    content?: BinaryNode[] | string | Uint8Array
+}
+
+export type BinaryNodeAttributes = BinaryNode['attrs']
+
+export type BinaryNodeData = BinaryNode['content']
+
+export type BinaryNodeCodingOptions = typeof constants

package/lib/WABinary/types.js

@@ -1,2 +1,3 @@
-import * as constants from './constants.js';
-//# sourceMappingURL=types.js.map
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })

package/lib/WAM/BinaryInfo.d.ts

@@ -1,9 +1,16 @@
-import type { EventInputType } from './constants.js';
 export declare class BinaryInfo {
-    protocolVersion: number;
-    sequence: number;
-    events: EventInputType[];
-    buffer: Buffer[];
-    constructor(options?: Partial<BinaryInfo>);
-}
-//# sourceMappingURL=BinaryInfo.d.ts.map
+    protocolVersion: number
+    sequence: number
+    events: {
+        [x: string]: {
+            props: {
+                [x: string]: import("./constants").Value
+            }
+            globals: {
+                [x: string]: import("./constants").Value
+            }
+        }
+    }[]
+    buffer: Buffer[]
+    constructor(options?: Partial<BinaryInfo>)
+}

package/lib/WAM/BinaryInfo.js

@@ -1,10 +1,17 @@
-export class BinaryInfo {
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+class BinaryInfo {
     constructor(options = {}) {
-        this.protocolVersion = 5;
-        this.sequence = 0;
-        this.events = [];
-        this.buffer = [];
-        Object.assign(this, options);
+        this.protocolVersion = 5
+        this.sequence = 0
+        this.events = []
+        this.buffer = []
+        Object.assign(this, options)
     }
 }
-//# sourceMappingURL=BinaryInfo.js.map
+
+module.exports = {
+  BinaryInfo
+}

package/lib/WAM/constants.d.ts

@@ -1,40 +1,47 @@
-export declare const WEB_EVENTS: Event[];
-export declare const WEB_GLOBALS: Global[];
-export declare const FLAG_BYTE = 8, FLAG_GLOBAL = 0, FLAG_EVENT = 1, FLAG_FIELD = 2, FLAG_EXTENDED = 4;
+export declare const WEB_EVENTS: Event[]
+
+export declare const WEB_GLOBALS: Global[]
+
+export declare const FLAG_BYTE = 8, FLAG_GLOBAL = 0, FLAG_EVENT = 1, FLAG_FIELD = 2, FLAG_EXTENDED = 4
+
 export type Event = {
-    name: string;
-    id: number;
+    name: string
+    id: number
     props: {
         [key: string]: [number, string | {
-            [key: string]: number;
-        }];
-    };
-    weight: number;
-    wamChannel: string;
-    privateStatsIdInt?: number;
-};
+            [key: string]: number
+        }]
+    }
+    weight: number
+    wamChannel: string
+    privateStatsIdInt: number
+}
+
 export type Global = {
-    name: string;
-    id: number;
+    name: string
+    id: number
     type: string | {
-        [key: string]: number;
-    };
-    validator?: string;
-    channels: string[];
-};
+        [key: string]: number
+    }
+    validator?: string
+    channels: string[]
+}
+
 type EventByName<T extends Event['name']> = Extract<Event, {
-    name: T;
-}>;
+    name: T
+}>
+
 export type EventInputType = {
     [key in Event['name']]: {
         props: {
-            [k in keyof EventByName<key>['props']]: Value;
-        };
+            [k in keyof EventByName<key>['props']]: Value
+        }
         globals: {
-            [x: string]: Value;
-        };
-    };
-} & {};
-export type Value = number | null | string;
-export {};
-//# sourceMappingURL=constants.d.ts.map
+            [x: string]: Value
+        }
+    }
+} & {}
+
+export type Value = number | null | string
+
+export {}