jagproject 26.3.23 → 26.3.26

package/lib/Utils/reporting-utils.d.ts

@@ -0,0 +1,11 @@
+import { proto } from '../../WAProto/index.js';
+import type { WAMessageContent, WAMessageKey } from '../Types/index.js';
+import type { BinaryNode } from '../WABinary/index.js';
+export type ReportingField = {
+    f: number;
+    m?: boolean;
+    s?: ReportingField[];
+};
+export declare const shouldIncludeReportingToken: (message: proto.IMessage) => boolean;
+export declare const getMessageReportingToken: (msgProtobuf: Buffer, message: WAMessageContent, key: WAMessageKey) => Promise<BinaryNode | null>;
+//# sourceMappingURL=reporting-utils.d.ts.map

package/lib/Utils/reporting-utils.js

@@ -0,0 +1,262 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMessageReportingToken = exports.shouldIncludeReportingToken = void 0;
+const crypto_1 = require("crypto");
+const index_js_1 = require("../../WAProto/index.js");
+const crypto_js_1 = require("./crypto.js");
+const reportingFields = [
+    { f: 1 },
+    {
+        f: 3,
+        s: [{ f: 2 }, { f: 3 }, { f: 8 }, { f: 11 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 25 }]
+    },
+    { f: 4, s: [{ f: 1 }, { f: 16 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 5, s: [{ f: 3 }, { f: 4 }, { f: 5 }, { f: 16 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 6, s: [{ f: 1 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 30 }] },
+    { f: 7, s: [{ f: 2 }, { f: 7 }, { f: 10 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 20 }] },
+    { f: 8, s: [{ f: 2 }, { f: 7 }, { f: 9 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 21 }] },
+    { f: 9, s: [{ f: 2 }, { f: 6 }, { f: 7 }, { f: 13 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 20 }] },
+    { f: 12, s: [{ f: 1 }, { f: 2 }, { f: 14, m: true }, { f: 15 }] },
+    { f: 18, s: [{ f: 6 }, { f: 16 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 26, s: [{ f: 4 }, { f: 5 }, { f: 8 }, { f: 13 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 28, s: [{ f: 1 }, { f: 2 }, { f: 4 }, { f: 5 }, { f: 6 }, { f: 7, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 37, s: [{ f: 1, m: true }] },
+    {
+        f: 49,
+        s: [
+            { f: 2 },
+            { f: 3, s: [{ f: 1 }, { f: 2 }] },
+            { f: 5, s: [{ f: 21 }, { f: 22 }] },
+            { f: 8, s: [{ f: 1 }, { f: 2 }] }
+        ]
+    },
+    { f: 53, s: [{ f: 1, m: true }] },
+    { f: 55, s: [{ f: 1, m: true }] },
+    { f: 58, s: [{ f: 1, m: true }] },
+    { f: 59, s: [{ f: 1, m: true }] },
+    {
+        f: 60,
+        s: [
+            { f: 2 },
+            { f: 3, s: [{ f: 1 }, { f: 2 }] },
+            { f: 5, s: [{ f: 21 }, { f: 22 }] },
+            { f: 8, s: [{ f: 1 }, { f: 2 }] }
+        ]
+    },
+    {
+        f: 64,
+        s: [
+            { f: 2 },
+            { f: 3, s: [{ f: 1 }, { f: 2 }] },
+            { f: 5, s: [{ f: 21 }, { f: 22 }] },
+            { f: 8, s: [{ f: 1 }, { f: 2 }] }
+        ]
+    },
+    { f: 66, s: [{ f: 2 }, { f: 6 }, { f: 7 }, { f: 13 }, { f: 17, s: [{ f: 21 }, { f: 22 }] }, { f: 20 }] },
+    { f: 74, s: [{ f: 1, m: true }] },
+    { f: 87, s: [{ f: 1, m: true }] },
+    { f: 88, s: [{ f: 1 }, { f: 2, s: [{ f: 1 }] }, { f: 3, s: [{ f: 21 }, { f: 22 }] }] },
+    { f: 92, s: [{ f: 1, m: true }] },
+    { f: 93, s: [{ f: 1, m: true }] },
+    { f: 94, s: [{ f: 1, m: true }] }
+];
+const compileReportingFields = (fields) => {
+    const map = new Map();
+    for (const f of fields) {
+        map.set(f.f, {
+            m: f.m,
+            children: f.s ? compileReportingFields(f.s) : undefined
+        });
+    }
+    return map;
+};
+const compiledReportingFields = compileReportingFields(reportingFields);
+const EMPTY_MAP = new Map();
+const ENC_SECRET_REPORT_TOKEN = 'Report Token';
+const WIRE = {
+    VARINT: 0,
+    FIXED64: 1,
+    BYTES: 2,
+    FIXED32: 5
+};
+const shouldIncludeReportingToken = (message) => !message.reactionMessage &&
+    !message.encReactionMessage &&
+    !message.encEventResponseMessage &&
+    !message.pollUpdateMessage;
+exports.shouldIncludeReportingToken = shouldIncludeReportingToken;
+const generateMsgSecretKey = (modificationType, origMsgId, origMsgSender, modificationSender, origMsgSecret) => {
+    const useCaseSecret = Buffer.concat([
+        Buffer.from(origMsgId, 'utf8'),
+        Buffer.from(origMsgSender, 'utf8'),
+        Buffer.from(modificationSender, 'utf8'),
+        Buffer.from(modificationType, 'utf8')
+    ]);
+    return (0, crypto_js_1.hkdf)(origMsgSecret, 32, { info: useCaseSecret.toString('latin1') });
+};
+const extractReportingTokenContent = (data, cfg) => {
+    const out = [];
+    let i = 0;
+    while (i < data.length) {
+        const tag = decodeVarint(data, i);
+        if (!tag.ok) {
+            return null;
+        }
+        const fieldNum = tag.value >> 3;
+        const wireType = tag.value & 0x7;
+        const fieldStart = i;
+        i += tag.bytes;
+        const fieldCfg = cfg.get(fieldNum);
+        const pushSlice = (end) => {
+            if (end > data.length) {
+                return false;
+            }
+            out.push({ num: fieldNum, bytes: data.subarray(fieldStart, end) });
+            i = end;
+            return true;
+        };
+        const skip = (end) => {
+            if (end > data.length) {
+                return false;
+            }
+            i = end;
+            return true;
+        };
+        if (wireType === WIRE.VARINT) {
+            const v = decodeVarint(data, i);
+            if (!v.ok) {
+                return null;
+            }
+            const end = i + v.bytes;
+            if (!fieldCfg) {
+                if (!skip(end)) {
+                    return null;
+                }
+                continue;
+            }
+            if (!pushSlice(end)) {
+                return null;
+            }
+            continue;
+        }
+        if (wireType === WIRE.FIXED64) {
+            const end = i + 8;
+            if (!fieldCfg) {
+                if (!skip(end)) {
+                    return null;
+                }
+                continue;
+            }
+            if (!pushSlice(end)) {
+                return null;
+            }
+            continue;
+        }
+        if (wireType === WIRE.FIXED32) {
+            const end = i + 4;
+            if (!fieldCfg) {
+                if (!skip(end)) {
+                    return null;
+                }
+                continue;
+            }
+            if (!pushSlice(end)) {
+                return null;
+            }
+            continue;
+        }
+        if (wireType === WIRE.BYTES) {
+            const len = decodeVarint(data, i);
+            if (!len.ok) {
+                return null;
+            }
+            const valStart = i + len.bytes;
+            const valEnd = valStart + len.value;
+            if (valEnd > data.length) {
+                return null;
+            }
+            if (!fieldCfg) {
+                i = valEnd;
+                continue;
+            }
+            if (fieldCfg.m || fieldCfg.children) {
+                const sub = extractReportingTokenContent(data.subarray(valStart, valEnd), fieldCfg.children ?? EMPTY_MAP);
+                if (sub === null) {
+                    return null;
+                }
+                if (sub.length > 0) {
+                    const newTag = encodeVarint(tag.value);
+                    const newLen = encodeVarint(sub.length);
+                    out.push({
+                        num: fieldNum,
+                        bytes: Buffer.concat([newTag, newLen, sub])
+                    });
+                }
+                i = valEnd;
+                continue;
+            }
+            out.push({ num: fieldNum, bytes: data.subarray(fieldStart, valEnd) });
+            i = valEnd;
+            continue;
+        }
+        return null;
+    }
+    if (out.length === 0) {
+        return Buffer.alloc(0);
+    }
+    out.sort((a, b) => a.num - b.num);
+    return Buffer.concat(out.map(f => f.bytes));
+};
+const decodeVarint = (buffer, offset) => {
+    let value = 0;
+    let bytes = 0;
+    let shift = 0;
+    while (offset + bytes < buffer.length) {
+        const current = buffer[offset + bytes];
+        value |= (current & 0x7f) << shift;
+        bytes++;
+        if ((current & 0x80) === 0) {
+            return { value, bytes, ok: true };
+        }
+        shift += 7;
+        if (shift > 35) {
+            return { value: 0, bytes: 0, ok: false };
+        }
+    }
+    return { value: 0, bytes: 0, ok: false };
+};
+const encodeVarint = (value) => {
+    const parts = [];
+    let remaining = value >>> 0;
+    while (remaining > 0x7f) {
+        parts.push((remaining & 0x7f) | 0x80);
+        remaining >>>= 7;
+    }
+    parts.push(remaining);
+    return Buffer.from(parts);
+};
+const getMessageReportingToken = async (msgProtobuf, message, key) => {
+    const msgSecret = message.messageContextInfo?.messageSecret;
+    if (!msgSecret || !key.id) {
+        return null;
+    }
+    const from = key.fromMe ? key.remoteJid : key.participant || key.remoteJid;
+    const to = key.fromMe ? key.participant || key.remoteJid : key.remoteJid;
+    const reportingSecret = generateMsgSecretKey(ENC_SECRET_REPORT_TOKEN, key.id, from, to, msgSecret);
+    const content = extractReportingTokenContent(msgProtobuf, compiledReportingFields);
+    if (!content || content.length === 0) {
+        return null;
+    }
+    const reportingToken = (0, crypto_1.createHmac)('sha256', reportingSecret).update(content).digest().subarray(0, 16);
+    return {
+        tag: 'reporting',
+        attrs: {},
+        content: [
+            {
+                tag: 'reporting_token',
+                attrs: { v: '2' },
+                content: reportingToken
+            }
+        ]
+    };
+};
+exports.getMessageReportingToken = getMessageReportingToken;

package/lib/Utils/resolve-jid.d.ts

@@ -0,0 +1,43 @@
+import type { WASocket } from '../Types/index.js';
+
+/**
+ * Resolve LID / mention JID / participant ID menjadi JID @s.whatsapp.net.
+ *
+ * @param conn    WASocket instance
+ * @param m       serialized message object (dari handler)
+ * @param target  JID/LID eksplisit, opsional (override dari m)
+ * @returns       JID @s.whatsapp.net atau null jika tidak bisa di-resolve
+ *
+ * @example
+ * const jid = await resolveJid(conn, m);
+ * if (!jid) return conn.sendMessage(m.chat, { text: 'Gagal resolve JID' });
+ * await conn.sendMessage(m.chat, { text: `JID: ${jid}` });
+ *
+ * @example
+ * // Resolve dari mention pertama
+ * const jid = await resolveJid(conn, m, m.mentionedJid?.[0]);
+ */
+export declare function resolveJid(
+    conn: WASocket,
+    m: {
+        sender?: string;
+        jid?: string;
+        chat?: string;
+        isGroup?: boolean;
+        mentionedJid?: string[];
+        quoted?: { sender?: string; participant?: string };
+    },
+    target?: string | null
+): Promise<string | null>;
+
+/**
+ * Resolve banyak JID/LID sekaligus.
+ *
+ * @example
+ * const jids = await resolveJids(conn, m, m.mentionedJid);
+ */
+export declare function resolveJids(
+    conn: WASocket,
+    m: Parameters<typeof resolveJid>[1],
+    targets?: string[]
+): Promise<(string | null)[]>;

package/lib/Utils/resolve-jid.js

@@ -0,0 +1,95 @@
+"use strict";
+/**
+ * resolve-jid.js
+ * Resolve LID / participant ID menjadi JID WhatsApp asli (@s.whatsapp.net).
+ *
+ * Berguna saat participant.jid di grup adalah format @lid,
+ * dan kamu butuh nomor WA aslinya.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveJid = resolveJid;
+exports.resolveJids = resolveJids;
+const index_js_1 = require("../WABinary/index.js");
+/**
+ * Resolve LID, mention JID, atau sender menjadi JID @s.whatsapp.net.
+ *
+ * @param {import('../Types').WASocket} conn
+ * @param {object} m        — serialized message object
+ * @param {string} [target] — JID/LID eksplisit (opsional, override otomatis)
+ * @returns {Promise<string|null>}
+ *
+ * @example
+ * // Di dalam handler:
+ * const jid = await resolveJid(conn, m);
+ * if (!jid) return conn.sendMessage(m.chat, { text: 'Tidak bisa resolve JID' });
+ * await conn.sendMessage(m.chat, { text: `JID: ${jid}` });
+ *
+ * @example
+ * // Dengan target eksplisit (misalnya dari mention):
+ * const jid = await resolveJid(conn, m, m.mentionedJid?.[0]);
+ */
+async function resolveJid(conn, m, target) {
+    // Tentukan input — prioritas: target > mention > quoted sender > sender
+    const input = target ||
+        (m.mentionedJid && m.mentionedJid[0]) ||
+        (m.quoted && (m.quoted.sender || m.quoted.participant)) ||
+        m.sender ||
+        m.jid;
+    if (!input)
+        return null;
+    // Sudah berbentuk JID normal → langsung return
+    if (/@s\.whatsapp\.net$/.test(input)) {
+        return (0, index_js_1.jidNormalizedUser)(input);
+    }
+    // Jika bukan di grup, tidak bisa resolve LID via groupMetadata
+    if (!m.isGroup || !m.chat) {
+        // Coba normalise saja (untuk kasus user JID tanpa domain)
+        if (/^\d+$/.test(input.split('@')[0])) {
+            return `${input.split('@')[0]}@s.whatsapp.net`;
+        }
+        return null;
+    }
+    let meta;
+    try {
+        meta = await conn.groupMetadata(m.chat);
+    }
+    catch {
+        return null;
+    }
+    if (!meta || !Array.isArray(meta.participants))
+        return null;
+    // Cari match di participants: by jid, id, lid, atau user number
+    const inputUser = input.split('@')[0];
+    const participant = meta.participants.find(p => {
+        if (!p)
+            return false;
+        const pJid = p.jid || p.id || '';
+        const pLid = p.lid || '';
+        return (pJid === input ||
+            pLid === input ||
+            pJid.split('@')[0] === inputUser ||
+            pLid.split('@')[0] === inputUser);
+    });
+    if (participant) {
+        // Return JID yang sudah pasti @s.whatsapp.net
+        const resolved = participant.jid || participant.id;
+        if (resolved && /@s\.whatsapp\.net$/.test(resolved)) {
+            return (0, index_js_1.jidNormalizedUser)(resolved);
+        }
+    }
+    return null;
+}
+/**
+ * Resolve banyak JID/LID sekaligus.
+ *
+ * @param {import('../Types').WASocket} conn
+ * @param {object} m
+ * @param {string[]} targets
+ * @returns {Promise<(string|null)[]>}
+ *
+ * @example
+ * const jids = await resolveJids(conn, m, m.mentionedJid);
+ */
+async function resolveJids(conn, m, targets = []) {
+    return Promise.all(targets.map(t => resolveJid(conn, m, t)));
+}

package/lib/Utils/rust-bridge-shim.d.ts

@@ -0,0 +1,22 @@
+export type HKDFOptions = {
+    salt?: Uint8Array | Buffer | string;
+    info?: Uint8Array | Buffer | string;
+};
+export declare function md5(data: Uint8Array | Buffer | string): Buffer;
+export declare function hkdf(key: Uint8Array | Buffer | string, length: number, options?: HKDFOptions): Buffer;
+export declare function expandAppStateKeys(keyData: Uint8Array | Buffer | string): {
+    indexKey: Buffer;
+    valueEncryptionKey: Buffer;
+    valueMacKey: Buffer;
+    snapshotMacKey: Buffer;
+    patchMacKey: Buffer;
+};
+export declare class LTHashAntiTampering {
+    private readonly info;
+    private readonly size;
+    constructor(info?: string | Uint8Array | Buffer, size?: number);
+    subtractThenAdd(base: Uint8Array | Buffer, subtract?: Array<Uint8Array | Buffer>, add?: Array<Uint8Array | Buffer>): Buffer;
+    subtractThenAddInPlace(base: Buffer, subtract?: Array<Uint8Array | Buffer>, add?: Array<Uint8Array | Buffer>): Buffer;
+    private multipleOp;
+    private performPointwiseWithOverflow;
+}

package/lib/Utils/rust-bridge-shim.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LTHashAntiTampering = void 0;
+exports.md5 = md5;
+exports.hkdf = hkdf;
+exports.expandAppStateKeys = expandAppStateKeys;
+const crypto_1 = require("crypto");
+function toBuffer(input) {
+    if (Buffer.isBuffer(input)) return input;
+    if (input instanceof Uint8Array) return Buffer.from(input);
+    if (ArrayBuffer.isView(input)) return Buffer.from(input.buffer, input.byteOffset, input.byteLength);
+    if (input instanceof ArrayBuffer) return Buffer.from(input);
+    if (typeof input === "string") return Buffer.from(input);
+    return Buffer.from(input || []);
+}
+function normalizeHkdfOptions(options = {}) {
+    const salt = options.salt == null ? Buffer.alloc(0) : toBuffer(options.salt);
+    const info = options.info == null ? Buffer.alloc(0) : toBuffer(options.info);
+    return { salt, info };
+}
+function md5(data) {
+    return (0, crypto_1.createHash)("md5").update(toBuffer(data)).digest();
+}
+function hkdf(key, length, options = {}) {
+    const { salt, info } = normalizeHkdfOptions(options);
+    const out = crypto_1.hkdfSync("sha256", toBuffer(key), salt, info, length);
+    return Buffer.from(out);
+}
+function expandAppStateKeys(keyData) {
+    const expanded = hkdf(toBuffer(keyData), 160, { info: "WhatsApp Mutation Keys" });
+    return {
+        indexKey: expanded.subarray(0, 32),
+        valueEncryptionKey: expanded.subarray(32, 64),
+        valueMacKey: expanded.subarray(64, 96),
+        snapshotMacKey: expanded.subarray(96, 128),
+        patchMacKey: expanded.subarray(128, 160)
+    };
+}
+class LTHashAntiTampering {
+    constructor(info = "WhatsApp Patch Integrity", size = 128) {
+        this.info = toBuffer(info);
+        this.size = size;
+    }
+    subtractThenAdd(base, subtract = [], add = []) {
+        const output = Buffer.from(toBuffer(base));
+        this.subtractThenAddInPlace(output, subtract, add);
+        return output;
+    }
+    subtractThenAddInPlace(base, subtract = [], add = []) {
+        this.multipleOp(base, subtract, true);
+        this.multipleOp(base, add, false);
+        return base;
+    }
+    multipleOp(base, items, subtract) {
+        for (const item of items || []) {
+            const expanded = hkdf(item, this.size, { info: this.info });
+            this.performPointwiseWithOverflow(base, expanded, subtract);
+        }
+    }
+    performPointwiseWithOverflow(base, input, subtract) {
+        for (let i = 0; i < base.length; i += 2) {
+            const x = base.readUInt16LE(i);
+            const y = input.readUInt16LE(i);
+            const result = subtract ? (x - y + 0x10000) & 0xFFFF : (x + y) & 0xFFFF;
+            base.writeUInt16LE(result, i);
+        }
+        return base;
+    }
+}
+exports.LTHashAntiTampering = LTHashAntiTampering;

package/lib/Utils/serial-task-queue.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class SerialTaskQueue {
+    constructor(options = {}) {
+        this.concurrency = Math.max(1, Number(options.concurrency || 1));
+        this.running = 0;
+        this.queue = [];
+    }
+    add(task) {
+        return new Promise((resolve, reject) => {
+            this.queue.push({ task, resolve, reject });
+            this._drain();
+        });
+    }
+    _drain() {
+        while (this.running < this.concurrency && this.queue.length) {
+            const item = this.queue.shift();
+            this.running += 1;
+            Promise.resolve()
+                .then(() => item.task())
+                .then(value => item.resolve(value), error => item.reject(error))
+                .finally(() => {
+                this.running -= 1;
+                this._drain();
+            });
+        }
+    }
+}
+exports.default = SerialTaskQueue;

package/lib/Utils/signal.d.ts

@@ -0,0 +1,34 @@
+import type { SignalRepositoryWithLIDStore } from '../Types/index.js';
+import type { AuthenticationCreds, AuthenticationState, KeyPair, SignalIdentity, SignalKeyStore, SignedKeyPair } from '../Types/Auth.js';
+import { type BinaryNode, type FullJid } from '../WABinary/index.js';
+import type { USyncQueryResultList } from '../WAUSync/index.js';
+export declare const createSignalIdentity: (wid: string, accountSignatureKey: Uint8Array) => SignalIdentity;
+export declare const getPreKeys: ({ get }: SignalKeyStore, min: number, limit: number) => Promise<{
+    [id: string]: KeyPair;
+}>;
+export declare const generateOrGetPreKeys: (creds: AuthenticationCreds, range: number) => {
+    newPreKeys: {
+        [id: number]: KeyPair;
+    };
+    lastPreKeyId: number;
+    preKeysRange: readonly [number, number];
+};
+export declare const xmppSignedPreKey: (key: SignedKeyPair) => BinaryNode;
+export declare const xmppPreKey: (pair: KeyPair, id: number) => BinaryNode;
+export declare const parseAndInjectE2ESessions: (node: BinaryNode, repository: SignalRepositoryWithLIDStore) => Promise<void>;
+export declare const extractDeviceJids: (result: USyncQueryResultList[], myJid: string, myLid: string, excludeZeroDevices: boolean) => FullJid[];
+/**
+ * get the next N keys for upload or processing
+ * @param count number of pre-keys to get or generate
+ */
+export declare const getNextPreKeys: ({ creds, keys }: AuthenticationState, count: number) => Promise<{
+    update: Partial<AuthenticationCreds>;
+    preKeys: {
+        [id: string]: KeyPair;
+    };
+}>;
+export declare const getNextPreKeysNode: (state: AuthenticationState, count: number) => Promise<{
+    update: Partial<AuthenticationCreds>;
+    node: BinaryNode;
+}>;
+//# sourceMappingURL=signal.d.ts.map