@d0v3riz/baileys 6.7.4 → 6.7.6

package/lib/Utils/signal.js

@@ -1,6 +1,7 @@
 "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;
+const lodash_1 = require("lodash");
 const Defaults_1 = require("../Defaults");
 const WABinary_1 = require("../WABinary");
 const crypto_1 = require("./crypto");
@@ -66,22 +67,31 @@ const parseAndInjectE2ESessions = async (node, repository) => {
     for (const node of nodes) {
         (0, WABinary_1.assertNodeErrorFree)(node);
     }
-    await Promise.all(nodes.map(async (node) => {
-        const signedKey = (0, WABinary_1.getBinaryNodeChild)(node, 'skey');
-        const key = (0, WABinary_1.getBinaryNodeChild)(node, 'key');
-        const identity = (0, WABinary_1.getBinaryNodeChildBuffer)(node, 'identity');
-        const jid = node.attrs.jid;
-        const registrationId = (0, WABinary_1.getBinaryNodeChildUInt)(node, 'registration', 4);
-        await repository.injectE2ESession({
-            jid,
-            session: {
-                registrationId: registrationId,
-                identityKey: (0, crypto_1.generateSignalPubKey)(identity),
-                signedPreKey: extractKey(signedKey),
-                preKey: extractKey(key)
-            }
-        });
-    }));
+    // Most of the work in repository.injectE2ESession is CPU intensive, not IO
+    // So Promise.all doesn't really help here,
+    // but blocks even loop if we're using it inside keys.transaction, and it makes it "sync" actually
+    // This way we chunk it in smaller parts and between those parts we can yield to the event loop
+    // It's rare case when you need to E2E sessions for so many users, but it's possible
+    const chunkSize = 100;
+    const chunks = (0, lodash_1.chunk)(nodes, chunkSize);
+    for (const nodesChunk of chunks) {
+        await Promise.all(nodesChunk.map(async (node) => {
+            const signedKey = (0, WABinary_1.getBinaryNodeChild)(node, 'skey');
+            const key = (0, WABinary_1.getBinaryNodeChild)(node, 'key');
+            const identity = (0, WABinary_1.getBinaryNodeChildBuffer)(node, 'identity');
+            const jid = node.attrs.jid;
+            const registrationId = (0, WABinary_1.getBinaryNodeChildUInt)(node, 'registration', 4);
+            await repository.injectE2ESession({
+                jid,
+                session: {
+                    registrationId: registrationId,
+                    identityKey: (0, crypto_1.generateSignalPubKey)(identity),
+                    signedPreKey: extractKey(signedKey),
+                    preKey: extractKey(key)
+                }
+            });
+        }));
+    }
 };
 exports.parseAndInjectE2ESessions = parseAndInjectE2ESessions;
 const extractDeviceJids = (result, myJid, excludeZeroDevices) => {

package/lib/WABinary/decode.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { BinaryNode, BinaryNodeCodingOptions } from './types';
-export declare const decompressingIfRequired: (buffer: Buffer) => Buffer;
+export declare const decompressingIfRequired: (buffer: Buffer) => Promise<Buffer>;
 export declare const decodeDecompressedBinaryNode: (buffer: Buffer, opts: Pick<BinaryNodeCodingOptions, 'DOUBLE_BYTE_TOKENS' | 'SINGLE_BYTE_TOKENS' | 'TAGS'>, indexRef?: {
     index: number;
 }) => BinaryNode;
-export declare const decodeBinaryNode: (buff: Buffer) => BinaryNode;
+export declare const decodeBinaryNode: (buff: Buffer) => Promise<BinaryNode>;

package/lib/WABinary/decode.js

@@ -24,12 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeBinaryNode = exports.decodeDecompressedBinaryNode = exports.decompressingIfRequired = void 0;
+const util_1 = require("util");
 const zlib_1 = require("zlib");
 const constants = __importStar(require("./constants"));
 const jid_utils_1 = require("./jid-utils");
-const decompressingIfRequired = (buffer) => {
+const inflatePromise = (0, util_1.promisify)(zlib_1.inflate);
+const decompressingIfRequired = async (buffer) => {
     if (2 & buffer.readUInt8()) {
-        buffer = (0, zlib_1.inflateSync)(buffer.slice(1));
+        buffer = await inflatePromise(buffer.slice(1));
     }
     else { // nodes with no compression have a 0x00 prefix, we remove that
         buffer = buffer.slice(1);
@@ -245,8 +247,8 @@ const decodeDecompressedBinaryNode = (buffer, opts, indexRef = { index: 0 }) =>
     };
 };
 exports.decodeDecompressedBinaryNode = decodeDecompressedBinaryNode;
-const decodeBinaryNode = (buff) => {
-    const decompBuff = (0, exports.decompressingIfRequired)(buff);
+const decodeBinaryNode = async (buff) => {
+    const decompBuff = await (0, exports.decompressingIfRequired)(buff);
     return (0, exports.decodeDecompressedBinaryNode)(decompBuff, constants);
 };
 exports.decodeBinaryNode = decodeBinaryNode;

package/lib/WABinary/encode.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
 import type { BinaryNode, BinaryNodeCodingOptions } from './types';
-export declare const encodeBinaryNode: ({ tag, attrs, content }: BinaryNode, opts?: Pick<BinaryNodeCodingOptions, 'TAGS' | 'TOKEN_MAP'>, buffer?: number[]) => Buffer;
+export declare const encodeBinaryNode: (node: BinaryNode, opts?: Pick<BinaryNodeCodingOptions, 'TAGS' | 'TOKEN_MAP'>, buffer?: number[]) => Buffer;

package/lib/WABinary/encode.js

@@ -26,7 +26,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeBinaryNode = void 0;
 const constants = __importStar(require("./constants"));
 const jid_utils_1 = require("./jid-utils");
-const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0]) => {
+const encodeBinaryNode = (node, opts = constants, buffer = [0]) => {
+    const encoded = encodeBinaryNodeInner(node, opts, buffer);
+    return Buffer.from(encoded);
+};
+exports.encodeBinaryNode = encodeBinaryNode;
+const encodeBinaryNodeInner = ({ tag, attrs, content }, opts, buffer) => {
     const { TAGS, TOKEN_MAP } = opts;
     const pushByte = (value) => buffer.push(value & 0xff);
     const pushInt = (value, n, littleEndian = false) => {
@@ -214,7 +219,7 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
     else if (Array.isArray(content)) {
         writeListStart(content.length);
         for (const item of content) {
-            (0, exports.encodeBinaryNode)(item, opts, buffer);
+            encodeBinaryNodeInner(item, opts, buffer);
         }
     }
     else if (typeof content === 'undefined') {
@@ -223,6 +228,5 @@ const encodeBinaryNode = ({ tag, attrs, content }, opts = constants, buffer = [0
     else {
         throw new Error(`invalid children for header "${tag}": ${content} (${typeof content})`);
     }
-    return Buffer.from(buffer);
+    return buffer;
 };
-exports.encodeBinaryNode = encodeBinaryNode;

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

@@ -26,4 +26,6 @@ export declare const isJidBroadcast: (jid: string | undefined) => boolean | unde
 export declare const isJidGroup: (jid: string | undefined) => boolean | undefined;
 /** is the jid the status broadcast */
 export declare const isJidStatusBroadcast: (jid: string) => boolean;
+/** is the jid a newsletter */
+export declare const isJidNewsletter: (jid: string | undefined) => boolean | undefined;
 export declare const jidNormalizedUser: (jid: string | undefined) => string;

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.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.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.S_WHATSAPP_NET = '@s.whatsapp.net';
 exports.OFFICIAL_BIZ_JID = '16505361212@c.us';
 exports.SERVER_JID = 'server@c.us';
@@ -48,6 +48,9 @@ exports.isJidGroup = isJidGroup;
 /** is the jid the status broadcast */
 const isJidStatusBroadcast = (jid) => jid === 'status@broadcast';
 exports.isJidStatusBroadcast = isJidStatusBroadcast;
+/** is the jid a newsletter */
+const isJidNewsletter = (jid) => (jid === null || jid === void 0 ? void 0 : jid.endsWith('@newsletter'));
+exports.isJidNewsletter = isJidNewsletter;
 const jidNormalizedUser = (jid) => {
     const result = (0, exports.jidDecode)(jid);
     if (!result) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d0v3riz/baileys",
-  "version": "6.7.4",
+  "version": "6.7.6",
   "description": "WhatsApp API",
   "keywords": [
     "whatsapp",
@@ -48,16 +48,17 @@
     "@hapi/boom": "^9.1.3",
     "async-lock": "^1.4.1",
     "audio-decode": "^2.1.3",
-    "axios": "^1.3.3",
+    "axios": "^1.6.0",
     "cache-manager": "4.0.1",
     "futoin-hkdf": "^1.5.1",
     "libphonenumber-js": "^1.10.20",
     "libsignal": "https://github.com/d0v3riz/libsignal-node.git",
+    "lodash": "^4.17.21",
     "music-metadata": "^7.12.3",
     "node-cache": "^5.1.2",
     "pino": "^7.0.0",
     "protobufjs": "^7.2.4",
-    "uuid": "^9.0.0",
+    "uuid": "^10.0.0",
     "ws": "^8.13.0"
   },
   "devDependencies": {
@@ -76,7 +77,7 @@
     "open": "^8.4.2",
     "qrcode-terminal": "^0.12.0",
     "release-it": "^15.10.3",
-    "sharp": "^0.30.5",
+    "sharp": "^0.32.6",
     "ts-jest": "^27.0.3",
     "ts-node": "^10.8.1",
     "typedoc": "^0.24.7",
@@ -86,7 +87,7 @@
     "jimp": "^0.16.1",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
-    "sharp": "^0.32.2"
+    "sharp": "^0.32.6"
   },
   "peerDependenciesMeta": {
     "jimp": {