@ubedsockets/baileys 1.6.9 → 1.7.0

package/lib/Utils/noise-handler.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeNoiseHandler = void 0;
-
 const boom_1 = require("@hapi/boom");
 const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
@@ -87,7 +86,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
             const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded);
             const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details);
             if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                throw new boom_1.Boom('certification match failed', { statusCode: 400 }); // 🅥🅨🅩🅔🅝
+                throw new boom_1.Boom('certification match failed', { statusCode: 400 });
             }
             const keyEnc = encrypt(noiseKey.public);
             await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral));

package/lib/Utils/process-message.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptPollVote = exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
+exports.getChatId = exports.shouldIncrementChatUnread = exports.isRealMessage = exports.cleanMessage = void 0;
+exports.decryptPollVote = decryptPollVote;
 const WAProto_1 = require("../../WAProto");
 const Types_1 = require("../Types");
 const messages_1 = require("../Utils/messages");
@@ -20,8 +21,21 @@ const REAL_MSG_REQ_ME_STUB_TYPES = new Set([
 /** Cleans a received message to further processing */
 const cleanMessage = (message, meId) => {
     // ensure remoteJid and participant doesn't have device or agent in it
-    message.key.remoteJid = (0, WABinary_1.jidNormalizedUser)(message.key.remoteJid);
-    message.key.participant = message.key.participant ? (0, WABinary_1.jidNormalizedUser)(message.key.participant) : undefined;
+    // normalize JIDs but catch errors to avoid throwing on invalid LIDs/JIDs
+    try {
+        message.key.remoteJid = (0, WABinary_1.jidNormalizedUser)(message.key.remoteJid);
+    }
+    catch (_e) {
+        // if normalization fails, retain original remoteJid
+    }
+    if (message.key.participant) {
+        try {
+            message.key.participant = (0, WABinary_1.jidNormalizedUser)(message.key.participant);
+        }
+        catch (_e) {
+            // ignore if can't normalize participant
+        }
+    }
     const content = (0, messages_1.normalizeMessageContent)(message.message);
     // if the message has a reaction, ensure fromMe & remoteJid are from our perspective
     if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
@@ -101,14 +115,14 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
         return Buffer.from(txt);
     }
 }
-exports.decryptPollVote = decryptPollVote;
-const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+const processMessage = async (message, { shouldProcessHistoryMsg, placeholderResendCache, ev, creds, keyStore, logger, options, getMessage }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const meId = creds.me.id;
     const { accountSettings } = creds;
     const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
     const isRealMsg = (0, exports.isRealMessage)(message, meId);
     if (isRealMsg) {
+        chat.messages = [{ message }];
         chat.conversationTimestamp = (0, generics_1.toNumber)(message.messageTimestamp);
         // only increment unread count if not CIPHERTEXT and from another person
         if ((0, exports.shouldIncrementChatUnread)(message)) {
@@ -116,6 +130,25 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
         }
     }
     const content = (0, messages_1.normalizeMessageContent)(message.message);
+    const senderId = message.key.participant || message.key.remoteJid;
+    if ((0, WABinary_1.isLidUser)(senderId)) {
+        const jid = (0, WABinary_1.lidToJid)(senderId);
+        if (message.key.participant) {
+            message.key.participant = jid;
+        }
+        else {
+            message.key.remoteJid = jid;
+        }
+    }
+    const mJids = content && content.contextInfo && content.contextInfo.mentionedJid ? content.contextInfo.mentionedJid : [];
+    for (let i = 0; i < mJids.length; i++) {
+        if ((0, WABinary_1.isLidUser)(mJids[i])) {
+            mJids[i] = (0, WABinary_1.lidToJid)(mJids[i]);
+        }
+    }
+    if (content && content.contextInfo && content.contextInfo.participant && (0, WABinary_1.isLidUser)(content.contextInfo.participant)) {
+        content.contextInfo.participant = (0, WABinary_1.lidToJid)(content.contextInfo.participant);
+    }
     // unarchive chat if it's a real message, or someone reacted to our message
     // and we've the unarchive chats setting on
     if ((isRealMsg || ((_b = (_a = content === null || content === void 0 ? void 0 : content.reactionMessage) === null || _a === void 0 ? void 0 : _a.key) === null || _b === void 0 ? void 0 : _b.fromMe))
@@ -137,14 +170,22 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                     isLatest,
                 }, 'got history notification');
                 if (process) {
-                    ev.emit('creds.update', {
-                        processedHistoryMessages: [
-                            ...(creds.processedHistoryMessages || []),
-                            { key: message.key, messageTimestamp: message.messageTimestamp }
-                        ]
-                    });
+                    if (histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+                        ev.emit('creds.update', {
+                            processedHistoryMessages: [
+                                ...(creds.processedHistoryMessages || []),
+                                { key: message.key, messageTimestamp: message.messageTimestamp }
+                            ]
+                        });
+                    }
                     const data = await (0, history_1.downloadAndProcessHistorySyncNotification)(histNotification, options);
-                    ev.emit('messaging-history.set', { ...data, isLatest });
+                    ev.emit('messaging-history.set', {
+                        ...data,
+                        isLatest: histNotification.syncType !== WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND
+                            ? isLatest
+                            : undefined,
+                        peerDataRequestSessionId: histNotification.peerDataRequestSessionId
+                    });
                 }
                 break;
             case WAProto_1.proto.Message.ProtocolMessage.Type.APP_STATE_SYNC_KEY_SHARE:
@@ -187,17 +228,41 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
                 const response = protocolMsg.peerDataOperationRequestResponseMessage;
                 if (response) {
+                    placeholderResendCache === null || placeholderResendCache === void 0 ? void 0 : placeholderResendCache.del(response.stanzaId);
+                    // TODO: IMPLEMENT HISTORY SYNC ETC (sticker uploads etc.).
                     const { peerDataOperationResult } = response;
                     for (const result of peerDataOperationResult) {
                         const { placeholderMessageResendResponse: retryResponse } = result;
                         if (retryResponse) {
                             const webMessageInfo = WAProto_1.proto.WebMessageInfo.decode(retryResponse.webMessageInfoBytes);
-                            ev.emit('messages.update', [
-                                { key: webMessageInfo.key, update: { message: webMessageInfo.message } }
-                            ]);
+                            // wait till another upsert event is available, don't want it to be part of the PDO response message
+                            setTimeout(() => {
+                                ev.emit('messages.upsert', {
+                                    messages: [webMessageInfo],
+                                    type: 'notify',
+                                    requestId: response.stanzaId
+                                });
+                            }, 500);
                         }
                     }
                 }
+            case WAProto_1.proto.Message.ProtocolMessage.Type.MESSAGE_EDIT:
+                ev.emit('messages.update', [
+                    {
+                        // flip the sender / fromMe properties because they're in the perspective of the sender
+                        key: { ...message.key, id: (_d = protocolMsg.key) === null || _d === void 0 ? void 0 : _d.id },
+                        update: {
+                            message: {
+                                editedMessage: {
+                                    message: protocolMsg.editedMessage
+                                }
+                            },
+                            messageTimestamp: protocolMsg.timestampMs
+                                ? Math.floor((0, generics_1.toNumber)(protocolMsg.timestampMs) / 1000)
+                                : message.messageTimestamp
+                        }
+                    }
+                ]);
                 break;
         }
     }
@@ -208,11 +273,11 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
         };
         ev.emit('messages.reaction', [{
                 reaction,
-                key: content.reactionMessage.key,
+                key: (_e = content.reactionMessage) === null || _e === void 0 ? void 0 : _e.key,
             }]);
     }
     else if (message.messageStubType) {
-        const jid = message.key.remoteJid;
+        const jid = (_f = message.key) === null || _f === void 0 ? void 0 : _f.remoteJid;
         //let actor = whatsappID (message.participant)
         let participants;
         const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }));
@@ -220,8 +285,15 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             var _a;
             ev.emit('groups.update', [{ id: jid, ...update, author: (_a = message.participant) !== null && _a !== void 0 ? _a : undefined }]);
         };
+        const emitGroupRequestJoin = (participant, action, method) => {
+            ev.emit('group.join-request', { id: jid, author: message.participant, participant, action, method: method });
+        };
         const participantsIncludesMe = () => participants.find(jid => (0, WABinary_1.areJidsSameUser)(meId, jid));
         switch (message.messageStubType) {
+            case Types_1.WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+                participants = message.messageStubParameters || [];
+                emitParticipantsUpdate('modify');
+                break;
             case Types_1.WAMessageStubType.GROUP_PARTICIPANT_LEAVE:
             case Types_1.WAMessageStubType.GROUP_PARTICIPANT_REMOVE:
                 participants = message.messageStubParameters || [];
@@ -249,30 +321,41 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                 emitParticipantsUpdate('promote');
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_ANNOUNCE:
-                const announceValue = (_d = message.messageStubParameters) === null || _d === void 0 ? void 0 : _d[0];
+                const announceValue = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
                 emitGroupUpdate({ announce: announceValue === 'true' || announceValue === 'on' });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_RESTRICT:
-                const restrictValue = (_e = message.messageStubParameters) === null || _e === void 0 ? void 0 : _e[0];
+                const restrictValue = (_h = message.messageStubParameters) === null || _h === void 0 ? void 0 : _h[0];
                 emitGroupUpdate({ restrict: restrictValue === 'true' || restrictValue === 'on' });
                 break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_SUBJECT:
-                const name = (_f = message.messageStubParameters) === null || _f === void 0 ? void 0 : _f[0];
+                const name = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
                 chat.name = name;
                 emitGroupUpdate({ subject: name });
                 break;
+            case Types_1.WAMessageStubType.GROUP_CHANGE_DESCRIPTION:
+                const description = (_k = message.messageStubParameters) === null || _k === void 0 ? void 0 : _k[0];
+                chat.description = description;
+                emitGroupUpdate({ desc: description });
+                break;
             case Types_1.WAMessageStubType.GROUP_CHANGE_INVITE_LINK:
-                const code = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[0];
+                const code = (_l = message.messageStubParameters) === null || _l === void 0 ? void 0 : _l[0];
                 emitGroupUpdate({ inviteCode: code });
                 break;
             case Types_1.WAMessageStubType.GROUP_MEMBER_ADD_MODE:
-                const memberAddValue = (_h = message.messageStubParameters) === null || _h === void 0 ? void 0 : _h[0];
+                const memberAddValue = (_m = message.messageStubParameters) === null || _m === void 0 ? void 0 : _m[0];
                 emitGroupUpdate({ memberAddMode: memberAddValue === 'all_member_add' });
                 break;
             case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_MODE:
-                const approvalMode = (_j = message.messageStubParameters) === null || _j === void 0 ? void 0 : _j[0];
+                const approvalMode = (_o = message.messageStubParameters) === null || _o === void 0 ? void 0 : _o[0];
                 emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
                 break;
+            case Types_1.WAMessageStubType.GROUP_MEMBERSHIP_JOIN_APPROVAL_REQUEST_NON_ADMIN_ADD:
+                const participant = (_p = message.messageStubParameters) === null || _p === void 0 ? void 0 : _p[0];
+                const action = (_q = message.messageStubParameters) === null || _q === void 0 ? void 0 : _q[1];
+                const method = (_r = message.messageStubParameters) === null || _r === void 0 ? void 0 : _r[2];
+                emitGroupRequestJoin(participant, action, method);
+                break;
         }
     }
     else if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
@@ -283,7 +366,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
             const meIdNormalised = (0, WABinary_1.jidNormalizedUser)(meId);
             const pollCreatorJid = (0, generics_1.getKeyAuthor)(creationMsgKey, meIdNormalised);
             const voterJid = (0, generics_1.getKeyAuthor)(message.key, meIdNormalised);
-            const pollEncKey = (_k = pollMsg.messageContextInfo) === null || _k === void 0 ? void 0 : _k.messageSecret;
+            const pollEncKey = (_s = pollMsg.messageContextInfo) === null || _s === void 0 ? void 0 : _s.messageSecret;
             try {
                 const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
                     pollEncKey,

package/lib/Utils/signal.js

@@ -1,15 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNextPreKeysNode =
-exports.getNextPreKeys =
-exports.extractDeviceJids =
-exports.parseAndInjectE2ESessions =
-exports.xmppPreKey =
-exports.xmppSignedPreKey =
-exports.generateOrGetPreKeys =
-exports.getPreKeys =
-exports.createSignalIdentity = void 0;
-
+exports.getNextPreKeysNode = exports.getNextPreKeys = exports.extractDeviceJids = exports.parseAndInjectE2ESessions = exports.xmppPreKey = exports.xmppSignedPreKey = exports.generateOrGetPreKeys = exports.getPreKeys = exports.createSignalIdentity = void 0;
 const lodash_1 = require("lodash");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");

package/lib/Utils/use-multi-file-auth-state.js

@@ -8,7 +8,7 @@ const WAProto_1 = require("../../WAProto");
 const auth_utils_1 = require("./auth-utils");
 const generics_1 = require("./generics");
 // We need to lock files due to the fact that we are using async functions to read and write files
-// https://github.com/WhiskeySockets/Baileys/issues/794
+// https://github.com/WhiskeySockets/Wileys/issues/794
 // https://github.com/nodejs/node/issues/26338
 // Use a Map to store mutexes for each file path
 const fileLocks = new Map();

package/lib/Utils/validate-connection.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeSignedDeviceIdentity =
-exports.configureSuccessfulPairing =
-exports.generateRegistrationNode =
-exports.generateLoginNode = void 0;
-
+exports.encodeSignedDeviceIdentity = exports.configureSuccessfulPairing = exports.generateRegistrationNode = exports.generateLoginNode = void 0;
 const boom_1 = require("@hapi/boom");
 const crypto_1 = require("crypto");
 const WAProto_1 = require("../../WAProto");
@@ -76,7 +72,7 @@ const getPlatformType = (platform) => {
 };
 
 const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
-    const appVersionBuf = (0, crypto_1.createHash)('md5') // 🅥🅨🅩🅔🅝
+    const appVersionBuf = (0, crypto_1.createHash)('md5')
         .update(config.version.join('.'))
         .digest();
 
@@ -189,7 +185,7 @@ const configureSuccessfulPairing = (stanza, { advSecretKey, signedIdentityKey, s
             type: 'result',
             id: msgId,
         },
-        content: [ // 🆅🆈🆉🅴🅽
+        content: [
             {
                 tag: 'pair-device-sign',
                 attrs: {},

package/lib/Voip/audio-feeder.js

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AudioFeeder = void 0;
+
+const child_process_1 = require("node:child_process");
+
+const LOW_WATERMARK_CHUNKS = 16;
+const MAX_QUEUED_CHUNKS = 1024;
+const DEFAULT_WARMUP_MS = 500;
+
+class AudioFeeder {
+    constructor(sampleRate, channels, framesPerChunk, onChunk, source = "silence") {
+        this.sampleRate = sampleRate;
+        this.channels = channels;
+        this.framesPerChunk = framesPerChunk;
+        this.onChunk = onChunk;
+        this.source = source;
+
+        this._proc = null;
+        this._pending = Buffer.alloc(0);
+        this._queue = [];
+        this._emitTimer = null;
+        this._nextEmitAtMs = 0;
+        this._warmupUntilMs = 0;
+
+        this.droppedChunks = 0;
+        this.underflowChunks = 0;
+        this.bytesProduced = 0;
+        this.chunksEmitted = 0;
+
+        this.start = () => {
+            if (this._proc) {
+                return;
+            }
+
+            const chunkSamples = this.framesPerChunk * this.channels;
+            const chunkBytes = chunkSamples * Float32Array.BYTES_PER_ELEMENT;
+            const chunkIntervalMs = (this.framesPerChunk / this.sampleRate) * 1000;
+            const inputArgs = this._resolveInputArgs();
+
+            this._proc = (0, child_process_1.spawn)("ffmpeg", [
+                "-hide_banner",
+                "-loglevel",
+                "error",
+                "-thread_queue_size",
+                "512",
+                ...inputArgs,
+                "-f",
+                "f32le",
+                "-ac",
+                String(this.channels),
+                "-ar",
+                String(this.sampleRate),
+                "pipe:1"
+            ]);
+
+            this._proc.stdout.on("data", chunk => {
+                this._pending = Buffer.concat([this._pending, chunk]);
+
+                while (this._pending.length >= chunkBytes) {
+                    if (this._queue.length >= MAX_QUEUED_CHUNKS) {
+                        this._proc?.stdout.pause();
+                        break;
+                    }
+
+                    const frame = this._pending.subarray(0, chunkBytes);
+                    this._pending = this._pending.subarray(chunkBytes);
+
+                    const out = new Float32Array(chunkSamples);
+                    out.set(new Float32Array(frame.buffer, frame.byteOffset, chunkSamples));
+
+                    this.bytesProduced += chunkBytes;
+                    this._queue.push(out);
+                }
+            });
+
+            this._proc.stderr.on("data", chunk => {
+                process.stderr.write(`[AudioFeeder] ${chunk.toString().trim()}\n`);
+            });
+
+            this._proc.on("exit", code => {
+                if (code !== 0 && code !== null) {
+                    process.stderr.write(`[AudioFeeder] ffmpeg exited with code=${code}\n`);
+                }
+
+                this._proc = null;
+            });
+
+            this._nextEmitAtMs = 0;
+            this._warmupUntilMs = Date.now() + DEFAULT_WARMUP_MS;
+            this._scheduleNext(chunkSamples, chunkIntervalMs);
+        };
+
+        this.stop = () => {
+            if (this._emitTimer) {
+                clearTimeout(this._emitTimer);
+                this._emitTimer = null;
+            }
+
+            this._proc?.kill("SIGTERM");
+            this._proc = null;
+            this._pending = Buffer.alloc(0);
+            this._queue = [];
+            this._warmupUntilMs = 0;
+        };
+
+        this._resolveInputArgs = () => {
+            if (!this.source || this.source === "silence") {
+                return ["-f", "lavfi", "-i", `aevalsrc=0:d=3600:s=${this.sampleRate}`];
+            }
+
+            if (this.source.startsWith("lavfi:")) {
+                return ["-f", "lavfi", "-i", this.source.slice("lavfi:".length)];
+            }
+
+            return ["-i", this.source];
+        };
+
+        this._scheduleNext = (chunkSamples, chunkIntervalMs) => {
+            if (!this._proc) {
+                return;
+            }
+
+            const now = Date.now();
+
+            if (this._nextEmitAtMs === 0) {
+                this._nextEmitAtMs = now;
+            }
+
+            const delayMs = Math.max(0, this._nextEmitAtMs - now);
+
+            this._emitTimer = setTimeout(() => {
+                this._emitTimer = null;
+
+                if (this._queue.length < LOW_WATERMARK_CHUNKS && Date.now() < this._warmupUntilMs) {
+                    this._nextEmitAtMs = Date.now() + 10;
+                    this._scheduleNext(chunkSamples, chunkIntervalMs);
+                    return;
+                }
+
+                this._flushOne(chunkSamples);
+                this._nextEmitAtMs += chunkIntervalMs;
+                this._scheduleNext(chunkSamples, chunkIntervalMs);
+            }, delayMs);
+        };
+
+        this._flushOne = chunkSamples => {
+            let nextChunk = this._queue.shift();
+
+            if (!nextChunk) {
+                nextChunk = new Float32Array(chunkSamples);
+                this.underflowChunks += 1;
+            }
+
+            this.chunksEmitted += 1;
+            this.onChunk(nextChunk);
+
+            if (this._proc?.stdout.isPaused() && this._queue.length <= MAX_QUEUED_CHUNKS / 4) {
+                this._proc.stdout.resume();
+            }
+        };
+    }
+}
+
+exports.AudioFeeder = AudioFeeder;
+exports.default = AudioFeeder;