@queenanya/baileys 6.6.6 → 6.7.0

package/lib/Utils/decode-wa-message.js

@@ -10,7 +10,7 @@ const NO_MESSAGE_FOUND_ERROR_TEXT = 'Message absent from node';
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
  */
-function decodeMessageNode(stanza, meId) {
+function decodeMessageNode(stanza, meId, meLid) {
     let msgType;
     let chatId;
     let author;
@@ -19,6 +19,7 @@ function decodeMessageNode(stanza, meId) {
     const participant = stanza.attrs.participant;
     const recipient = stanza.attrs.recipient;
     const isMe = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meId);
+    const isMeLid = (jid) => (0, WABinary_1.areJidsSameUser)(jid, meLid);
     if ((0, WABinary_1.isJidUser)(from)) {
         if (recipient) {
             if (!isMe(from)) {
@@ -32,6 +33,19 @@ function decodeMessageNode(stanza, meId) {
         msgType = 'chat';
         author = from;
     }
+    else if ((0, WABinary_1.isLidUser)(from)) {
+        if (recipient) {
+            if (!isMeLid(from)) {
+                throw new boom_1.Boom('receipient present, but msg not from me', { data: stanza });
+            }
+            chatId = recipient;
+        }
+        else {
+            chatId = from;
+        }
+        msgType = 'chat';
+        author = from;
+    }
     else if ((0, WABinary_1.isJidGroup)(from)) {
         if (!participant) {
             throw new boom_1.Boom('No participant in group message');
@@ -57,7 +71,7 @@ function decodeMessageNode(stanza, meId) {
     else {
         throw new boom_1.Boom('Unknown message type', { data: stanza });
     }
-    const fromMe = isMe(stanza.attrs.participant || stanza.attrs.from);
+    const fromMe = ((0, WABinary_1.isLidUser)(from) ? isMeLid : isMe)(stanza.attrs.participant || stanza.attrs.from);
     const pushname = stanza.attrs.notify;
     const key = {
         remoteJid: chatId,
@@ -81,8 +95,8 @@ function decodeMessageNode(stanza, meId) {
     };
 }
 exports.decodeMessageNode = decodeMessageNode;
-const decryptMessageNode = (stanza, meId, repository, logger) => {
-    const { fullMessage, author, sender } = decodeMessageNode(stanza, meId);
+const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
+    const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid);
     return {
         fullMessage,
         category: stanza.attrs.category,

package/lib/Utils/generics.d.ts

@@ -8,6 +8,7 @@ export declare const Browsers: {
     ubuntu: (browser: any) => [string, string, string];
     macOS: (browser: any) => [string, string, string];
     baileys: (browser: any) => [string, string, string];
+    windows: (browser: any) => [string, string, string];
     /** The appropriate browser based on your OS & release */
     appropriate: (browser: any) => [string, string, string];
 };

package/lib/Utils/generics.js

@@ -22,6 +22,7 @@ exports.Browsers = {
     ubuntu: browser => ['Firefox (linux)', browser, '119.0'],
     macOS: browser => ['Firefox (linux)', browser, '119.0'],
     baileys: browser => ['Firefox (linux)', browser, '119.0'],
+    windows: browser => ['Windows', browser, '10.0.22621'],
     /** The appropriate browser based on your OS & release */
     appropriate: browser => [PLATFORM_MAP[(0, os_1.platform)()] || 'Firefox (linux)', browser, (0, os_1.release)()]
 };

package/lib/Utils/messages-media.js

@@ -213,7 +213,7 @@ exports.getAudioDuration = getAudioDuration;
  */
 async function getAudioWaveform(buffer, logger) {
     try {
-        const audioDecode = (...args) => import('audio-decode').then(({ default: audioDecode }) => audioDecode(...args));
+        const audioDecode = (buffer) => import('audio-decode').then(({ default: audioDecode }) => audioDecode(buffer));
         let audioData;
         if (Buffer.isBuffer(buffer)) {
             audioData = buffer;

package/lib/Utils/messages.d.ts

@@ -39,7 +39,7 @@ export declare const extractMessageContent: (content: WAMessageContent | undefin
 /**
  * Returns the device predicted by message ID
  */
-export declare const getDevice: (id: string) => "android" | "web" | "ios";
+export declare const getDevice: (id: string) => "android" | "unknown" | "web" | "ios" | "desktop";
 /** Upserts a receipt in the message */
 export declare const updateMessageWithReceipt: (msg: Pick<WAMessage, 'userReceipt'>, receipt: MessageUserReceipt) => void;
 /** Update the message with a new reaction */

package/lib/Utils/messages.js

@@ -357,6 +357,14 @@ const generateWAMessageContent = async (message, options) => {
             options: message.poll.values.map(optionName => ({ optionName })),
         };
     }
+    else if ('sharePhoneNumber' in message) {
+        m.protocolMessage = {
+            type: WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER
+        };
+    }
+    else if ('requestPhoneNumber' in message) {
+        m.requestPhoneNumberMessage = {};
+    }
     else {
         m = await (0, exports.prepareWAMessageMedia)(message, options);
     }
@@ -511,7 +519,7 @@ exports.generateWAMessage = generateWAMessage;
 const getContentType = (content) => {
     if (content) {
         const keys = Object.keys(content);
-        const key = keys.find(k => (k === 'conversation' || k.endsWith('Message')) && k !== 'senderKeyDistributionMessage');
+        const key = keys.find(k => (k === 'conversation' || k.includes('Message')) && k !== 'senderKeyDistributionMessage');
         return key;
     }
 };
@@ -540,6 +548,7 @@ const normalizeMessageContent = (content) => {
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessage)
             || (message === null || message === void 0 ? void 0 : message.documentWithCaptionMessage)
             || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2)
+            || (message === null || message === void 0 ? void 0 : message.viewOnceMessageV2Extension)
             || (message === null || message === void 0 ? void 0 : message.editedMessage));
     }
 };
@@ -590,10 +599,7 @@ exports.extractMessageContent = extractMessageContent;
 /**
  * Returns the device predicted by message ID
  */
-const getDevice = (id) => {
-    const deviceType = id.length > 21 ? 'android' : id.substring(0, 2) === '3A' ? 'ios' : 'web';
-    return deviceType;
-};
+const getDevice = (id) => /^3A.{18}$/.test(id) ? 'ios' : /^3E.{20}$/.test(id) ? 'web' : /^(.{21}|.{32})$/.test(id) ? 'android' : /^.{18}$/.test(id) ? 'desktop' : 'unknown';
 exports.getDevice = getDevice;
 /** Upserts a receipt in the message */
 const updateMessageWithReceipt = (msg, receipt) => {

package/lib/Utils/process-message.js

@@ -103,7 +103,7 @@ function decryptPollVote({ encPayload, encIv }, { pollCreatorJid, pollMsgId, pol
 }
 exports.decryptPollVote = decryptPollVote;
 const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, keyStore, logger, options, getMessage }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const meId = creds.me.id;
     const { accountSettings } = creds;
     const chat = { id: (0, WABinary_1.jidNormalizedUser)((0, exports.getChatId)(message.key)) };
@@ -184,6 +184,21 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                     ephemeralExpiration: protocolMsg.ephemeralExpiration || null
                 });
                 break;
+            case WAProto_1.proto.Message.ProtocolMessage.Type.PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE:
+                const response = protocolMsg.peerDataOperationRequestResponseMessage;
+                if (response) {
+                    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 } }
+                            ]);
+                        }
+                    }
+                }
+                break;
         }
     }
     else if (content === null || content === void 0 ? void 0 : content.reactionMessage) {
@@ -200,7 +215,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
         const jid = message.key.remoteJid;
         //let actor = whatsappID (message.participant)
         let participants;
-        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, participants, action }));
+        const emitParticipantsUpdate = (action) => (ev.emit('group-participants.update', { id: jid, author: message.participant, participants, action }));
         const emitGroupUpdate = (update) => {
             ev.emit('groups.update', [{ id: jid, ...update }]);
         };
@@ -249,6 +264,14 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                 const code = (_g = message.messageStubParameters) === null || _g === void 0 ? void 0 : _g[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];
+                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];
+                emitGroupUpdate({ joinApprovalMode: approvalMode === 'on' });
+                break;
         }
     }
     else if (content === null || content === void 0 ? void 0 : content.pollUpdateMessage) {
@@ -259,7 +282,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 = (_h = pollMsg.messageContextInfo) === null || _h === void 0 ? void 0 : _h.messageSecret;
+            const pollEncKey = (_k = pollMsg.messageContextInfo) === null || _k === void 0 ? void 0 : _k.messageSecret;
             try {
                 const voteMsg = decryptPollVote(content.pollUpdateMessage.vote, {
                     pollEncKey,
@@ -275,7 +298,7 @@ const processMessage = async (message, { shouldProcessHistoryMsg, ev, creds, key
                                 {
                                     pollUpdateMessageKey: message.key,
                                     vote: voteMsg,
-                                    senderTimestampMs: message.messageTimestamp,
+                                    senderTimestampMs: content.pollUpdateMessage.senderTimestampMs.toNumber(),
                                 }
                             ]
                         }

package/lib/Utils/validate-connection.js

@@ -77,8 +77,39 @@ const generateLoginNode = (userJid, config) => {
 };
 exports.generateLoginNode = generateLoginNode;
 const getPlatformType = (platform) => {
-    const platformType = platform.toUpperCase();
-    return WAProto_1.proto.DeviceProps.PlatformType[platformType] || WAProto_1.proto.DeviceProps.PlatformType.DESKTOP;
+    platform = platform.toLowerCase();
+    switch (platform) {
+        case 'Chrome':
+            return WAProto_1.proto.DeviceProps.PlatformType.CHROME;
+        case 'Firefox':
+            return WAProto_1.proto.DeviceProps.PlatformType.FIREFOX;
+        case 'Internet Explorer':
+            return WAProto_1.proto.DeviceProps.PlatformType.IE;
+        case 'Edge':
+            return WAProto_1.proto.DeviceProps.PlatformType.EDGE;
+        case 'Opera':
+            return WAProto_1.proto.DeviceProps.PlatformType.OPERA;
+        case 'Safari':
+            return WAProto_1.proto.DeviceProps.PlatformType.SAFARI;
+        case 'Desktop':
+            return WAProto_1.proto.DeviceProps.PlatformType.DESKTOP;
+        case 'chrome':
+            return WAProto_1.proto.DeviceProps.PlatformType.CHROME;
+        case 'firefox':
+            return WAProto_1.proto.DeviceProps.PlatformType.FIREFOX;
+        case 'internet explorer':
+            return WAProto_1.proto.DeviceProps.PlatformType.IE;
+        case 'edge':
+            return WAProto_1.proto.DeviceProps.PlatformType.EDGE;
+        case 'opera':
+            return WAProto_1.proto.DeviceProps.PlatformType.OPERA;
+        case 'safari':
+            return WAProto_1.proto.DeviceProps.PlatformType.SAFARI;
+        case 'desktop':
+            return WAProto_1.proto.DeviceProps.PlatformType.DESKTOP;
+        default:
+            return WAProto_1.proto.DeviceProps.PlatformType.DESKTOP;
+    }
 };
 const generateRegistrationNode = ({ registrationId, signedPreKey, signedIdentityKey }, config) => {
     // the app version needs to be md5 hashed

package/lib/WABinary/decode.js

@@ -147,7 +147,7 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
         const agent = readByte();
         const device = readByte();
         const user = readString(readByte());
-        return (0, jid_utils_1.jidEncode)(user, 's.whatsapp.net', device, agent);
+        return (0, jid_utils_1.jidEncode)(user, agent === 0 ? 's.whatsapp.net' : 'lid', device);
     };
     const readString = (tag) => {
         if (tag >= 1 && tag < SINGLE_BYTE_TOKENS.length) {

package/lib/WABinary/encode.js

@@ -62,10 +62,10 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
         writeByteLength(bytes.length);
         pushBytes(bytes);
     };
-    const writeJid = ({ agent, device, user, server }) => {
-        if (typeof agent !== 'undefined' || typeof device !== 'undefined') {
+    const writeJid = ({ domainType, device, user, server }) => {
+        if (typeof device !== 'undefined') {
             pushByte(TAGS.AD_JID);
-            pushByte(agent || 0);
+            pushByte(domainType || 0);
             pushByte(device || 0);
             writeString(user);
         }

package/lib/WABinary/jid-utils.d.ts

@@ -3,14 +3,14 @@ export declare const OFFICIAL_BIZ_JID = "16505361212@c.us";
 export declare const SERVER_JID = "server@c.us";
 export declare const PSA_WID = "0@c.us";
 export declare const STORIES_JID = "status@broadcast";
-export type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call';
+export type JidServer = 'c.us' | 'g.us' | 'broadcast' | 's.whatsapp.net' | 'call' | 'lid';
 export type JidWithDevice = {
     user: string;
     device?: number;
 };
 export type FullJid = JidWithDevice & {
     server: JidServer | string;
-    agent?: number;
+    domainType?: number;
 };
 export declare const jidEncode: (user: string | number | null, server: JidServer, device?: number, agent?: number) => string;
 export declare const jidDecode: (jid: string | undefined) => FullJid | undefined;
@@ -18,6 +18,8 @@ export declare const jidDecode: (jid: string | undefined) => FullJid | undefined
 export declare const areJidsSameUser: (jid1: string | undefined, jid2: string | undefined) => boolean;
 /** is the jid a user */
 export declare const isJidUser: (jid: string | undefined) => boolean | undefined;
+/** is the jid a group */
+export declare const isLidUser: (jid: string | undefined) => boolean | undefined;
 /** is the jid a broadcast */
 export declare const isJidBroadcast: (jid: string | undefined) => boolean | undefined;
 /** is the jid a group */

package/lib/WABinary/jid-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jidNormalizedUser = exports.isJidStatusBroadcast = exports.isJidGroup = exports.isJidBroadcast = 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.jidNormalizedUser = 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.S_WHATSAPP_NET = '@s.whatsapp.net';
 exports.OFFICIAL_BIZ_JID = '16505361212@c.us';
 exports.SERVER_JID = 'server@c.us';
@@ -18,11 +18,11 @@ const jidDecode = (jid) => {
     const server = jid.slice(sepIdx + 1);
     const userCombined = jid.slice(0, sepIdx);
     const [userAgent, device] = userCombined.split(':');
-    const [user, agent] = userAgent.split('_');
+    const user = userAgent.split('_')[0];
     return {
         server,
         user,
-        agent: agent ? +agent : undefined,
+        domainType: server === 'lid' ? 1 : 0,
         device: device ? +device : undefined
     };
 };
@@ -36,6 +36,9 @@ exports.areJidsSameUser = areJidsSameUser;
 /** is the jid a user */
 const isJidUser = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@s.whatsapp.net'));
 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 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": "@queenanya/baileys",
-  "version": "6.6.6",
+  "version": "6.7.0",
   "description": "WhatsApp API",
   "keywords": [
     "whatsapp",
@@ -46,14 +46,14 @@
     "@hapi/boom": "^9.1.3",
     "audio-decode": "^2.1.3",
     "axios": "^1.3.3",
-    "cache-manager": "^5.2.2",
+    "cache-manager": "4.0.1",
     "futoin-hkdf": "^1.5.1",
     "libphonenumber-js": "^1.10.20",
-    "libsignal": "npm:@queenanya/libsignal",
+    "libsignal": "npm:@queenanya/libsignal@latest",
     "music-metadata": "^7.12.3",
     "node-cache": "^5.1.2",
     "pino": "^7.0.0",
-    "protobufjs": "^6.11.3",
+    "protobufjs": "^7.2.4",
     "uuid": "^9.0.0",
     "ws": "^8.13.0"
   },
@@ -82,7 +82,7 @@
     "jimp": "^0.16.1",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.30.5"
+    "sharp": "^0.32.2"
   },
   "peerDependenciesMeta": {
     "jimp": {