@baileys-md/baileys 10.1.0 → 11.0.0

package/lib/Signal/Group/sender-key-state.js

@@ -0,0 +1,96 @@
+import { SenderChainKey } from './sender-chain-key.js';
+import { SenderMessageKey } from './sender-message-key.js';
+export class SenderKeyState {
+    constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
+        this.MAX_MESSAGE_KEYS = 2000;
+        if (senderKeyStateStructure) {
+            this.senderKeyStateStructure = senderKeyStateStructure;
+        }
+        else {
+            if (signatureKeyPair) {
+                signatureKeyPublic = signatureKeyPair.public;
+                signatureKeyPrivate = signatureKeyPair.private;
+            }
+            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey;
+            const senderChainKeyStructure = {
+                iteration: iteration || 0,
+                seed: chainKey || Buffer.alloc(0)
+            };
+            const signingKeyStructure = {
+                public: typeof signatureKeyPublic === 'string'
+                    ? Buffer.from(signatureKeyPublic, 'base64')
+                    : signatureKeyPublic || Buffer.alloc(0)
+            };
+            if (signatureKeyPrivate) {
+                signingKeyStructure.private =
+                    typeof signatureKeyPrivate === 'string' ? Buffer.from(signatureKeyPrivate, 'base64') : signatureKeyPrivate;
+            }
+            this.senderKeyStateStructure = {
+                senderKeyId: id || 0,
+                senderChainKey: senderChainKeyStructure,
+                senderSigningKey: signingKeyStructure,
+                senderMessageKeys: []
+            };
+        }
+    }
+    getKeyId() {
+        return this.senderKeyStateStructure.senderKeyId;
+    }
+    getSenderChainKey() {
+        return new SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed);
+    }
+    setSenderChainKey(chainKey) {
+        this.senderKeyStateStructure.senderChainKey = {
+            iteration: chainKey.getIteration(),
+            seed: chainKey.getSeed()
+        };
+    }
+    getSigningKeyPublic() {
+        const publicKey = this.senderKeyStateStructure.senderSigningKey.public;
+        if (publicKey instanceof Buffer) {
+            return publicKey;
+        }
+        else if (typeof publicKey === 'string') {
+            return Buffer.from(publicKey, 'base64');
+        }
+        return Buffer.from(publicKey || []);
+    }
+    getSigningKeyPrivate() {
+        const privateKey = this.senderKeyStateStructure.senderSigningKey.private;
+        if (!privateKey) {
+            return undefined;
+        }
+        if (privateKey instanceof Buffer) {
+            return privateKey;
+        }
+        else if (typeof privateKey === 'string') {
+            return Buffer.from(privateKey, 'base64');
+        }
+        return Buffer.from(privateKey || []);
+    }
+    hasSenderMessageKey(iteration) {
+        return this.senderKeyStateStructure.senderMessageKeys.some(key => key.iteration === iteration);
+    }
+    addSenderMessageKey(senderMessageKey) {
+        this.senderKeyStateStructure.senderMessageKeys.push({
+            iteration: senderMessageKey.getIteration(),
+            seed: senderMessageKey.getSeed()
+        });
+        if (this.senderKeyStateStructure.senderMessageKeys.length > this.MAX_MESSAGE_KEYS) {
+            this.senderKeyStateStructure.senderMessageKeys.shift();
+        }
+    }
+    removeSenderMessageKey(iteration) {
+        const index = this.senderKeyStateStructure.senderMessageKeys.findIndex(key => key.iteration === iteration);
+        if (index !== -1) {
+            const messageKey = this.senderKeyStateStructure.senderMessageKeys[index];
+            this.senderKeyStateStructure.senderMessageKeys.splice(index, 1);
+            return new SenderMessageKey(messageKey.iteration, messageKey.seed);
+        }
+        return null;
+    }
+    getStructure() {
+        return this.senderKeyStateStructure;
+    }
+}
+//# sourceMappingURL=sender-key-state.js.map

package/{WASignalGroup/sender_message_key.js → lib/Signal/Group/sender-message-key.js}

@@ -1,13 +1,6 @@
-const { deriveSecrets } = require('libsignal/src/crypto');
-class SenderMessageKey {
-    iteration = 0;
-
-    iv = Buffer.alloc(0);
-
-    cipherKey = Buffer.alloc(0);
-
-    seed = Buffer.alloc(0);
-
+/* @ts-ignore */
+import { deriveSecrets } from 'libsignal/src/crypto.js';
+export class SenderMessageKey {
     constructor(iteration, seed) {
         const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'));
         const keys = new Uint8Array(32);
@@ -15,25 +8,20 @@ class SenderMessageKey {
         keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16);
         this.iv = Buffer.from(derivative[0].slice(0, 16));
         this.cipherKey = Buffer.from(keys.buffer);
-
         this.iteration = iteration;
         this.seed = seed;
     }
-
     getIteration() {
         return this.iteration;
     }
-
     getIv() {
         return this.iv;
     }
-
     getCipherKey() {
         return this.cipherKey;
     }
-
     getSeed() {
         return this.seed;
     }
 }
-module.exports = SenderMessageKey;
+//# sourceMappingURL=sender-message-key.js.map

package/lib/Signal/libsignal.js

@@ -1,58 +1,29 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeLibSignalRepository = makeLibSignalRepository;
-const libsignal = __importStar(require("libsignal"));
-const WASignalGroup_1 = require("../../WASignalGroup");
-const Utils_1 = require("../Utils");
-const WABinary_1 = require("../WABinary");
-function makeLibSignalRepository(auth) {
+/* @ts-ignore */
+import * as libsignal from 'libsignal';
+import { generateSignalPubKey } from '../Utils/index.js';
+import { jidDecode } from '../WABinary/index.js';
+import { SenderKeyName } from './Group/sender-key-name.js';
+import { SenderKeyRecord } from './Group/sender-key-record.js';
+import { GroupCipher, GroupSessionBuilder, SenderKeyDistributionMessage } from './Group/index.js';
+export function makeLibSignalRepository(auth) {
     const storage = signalStorage(auth);
     return {
         decryptGroupMessage({ group, authorJid, msg }) {
             const senderName = jidToSignalSenderKeyName(group, authorJid);
-            const cipher = new WASignalGroup_1.GroupCipher(storage, senderName);
+            const cipher = new GroupCipher(storage, senderName);
             return cipher.decrypt(msg);
         },
         async processSenderKeyDistributionMessage({ item, authorJid }) {
-            const builder = new WASignalGroup_1.GroupSessionBuilder(storage);
+            const builder = new GroupSessionBuilder(storage);
+            if (!item.groupId) {
+                throw new Error('Group ID is required for sender key distribution message');
+            }
             const senderName = jidToSignalSenderKeyName(item.groupId, authorJid);
-            const senderMsg = new WASignalGroup_1.SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
-            const { [senderName]: senderKey } = await auth.keys.get('sender-key', [senderName]);
+            const senderMsg = new SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
+            const senderNameStr = senderName.toString();
+            const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
             if (!senderKey) {
-                await storage.storeSenderKey(senderName, new WASignalGroup_1.SenderKeyRecord());
+                await storage.storeSenderKey(senderName, new SenderKeyRecord());
             }
             await builder.process(senderName, senderMsg);
         },
@@ -67,6 +38,8 @@ function makeLibSignalRepository(auth) {
                 case 'msg':
                     result = await session.decryptWhisperMessage(ciphertext);
                     break;
+                default:
+                    throw new Error(`Unknown message type: ${type}`);
             }
             return result;
         },
@@ -79,17 +52,18 @@ function makeLibSignalRepository(auth) {
         },
         async encryptGroupMessage({ group, meId, data }) {
             const senderName = jidToSignalSenderKeyName(group, meId);
-            const builder = new WASignalGroup_1.GroupSessionBuilder(storage);
-            const { [senderName]: senderKey } = await auth.keys.get('sender-key', [senderName]);
+            const builder = new GroupSessionBuilder(storage);
+            const senderNameStr = senderName.toString();
+            const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
             if (!senderKey) {
-                await storage.storeSenderKey(senderName, new WASignalGroup_1.SenderKeyRecord());
+                await storage.storeSenderKey(senderName, new SenderKeyRecord());
             }
             const senderKeyDistributionMessage = await builder.create(senderName);
-            const session = new WASignalGroup_1.GroupCipher(storage, senderName);
+            const session = new GroupCipher(storage, senderName);
             const ciphertext = await session.encrypt(data);
             return {
                 ciphertext,
-                senderKeyDistributionMessage: senderKeyDistributionMessage.serialize(),
+                senderKeyDistributionMessage: senderKeyDistributionMessage.serialize()
             };
         },
         async injectE2ESession({ jid, session }) {
@@ -98,15 +72,15 @@ function makeLibSignalRepository(auth) {
         },
         jidToSignalProtocolAddress(jid) {
             return jidToSignalProtocolAddress(jid).toString();
-        },
+        }
     };
 }
 const jidToSignalProtocolAddress = (jid) => {
-    const { user, device } = (0, WABinary_1.jidDecode)(jid);
+    const { user, device } = jidDecode(jid);
     return new libsignal.ProtocolAddress(user, device || 0);
 };
 const jidToSignalSenderKeyName = (group, user) => {
-    return new WASignalGroup_1.SenderKeyName(group, jidToSignalProtocolAddress(user)).toString();
+    return new SenderKeyName(group, jidToSignalProtocolAddress(user));
 };
 function signalStorage({ creds, keys }) {
     return {
@@ -116,8 +90,9 @@ function signalStorage({ creds, keys }) {
                 return libsignal.SessionRecord.deserialize(sess);
             }
         },
+        // TODO: Replace with libsignal.SessionRecord when type exports are added to libsignal
         storeSession: async (id, session) => {
-            await keys.set({ 'session': { [id]: session.serialize() } });
+            await keys.set({ session: { [id]: session.serialize() } });
         },
         isTrustedIdentity: () => {
             return true;
@@ -140,22 +115,27 @@ function signalStorage({ creds, keys }) {
                 pubKey: Buffer.from(key.keyPair.public)
             };
         },
-        loadSenderKey: async (keyId) => {
+        loadSenderKey: async (senderKeyName) => {
+            const keyId = senderKeyName.toString();
             const { [keyId]: key } = await keys.get('sender-key', [keyId]);
             if (key) {
-                return new WASignalGroup_1.SenderKeyRecord(key);
+                return SenderKeyRecord.deserialize(key);
             }
+            return new SenderKeyRecord();
         },
-        storeSenderKey: async (keyId, key) => {
-            await keys.set({ 'sender-key': { [keyId]: key.serialize() } });
+        storeSenderKey: async (senderKeyName, key) => {
+            const keyId = senderKeyName.toString();
+            const serialized = JSON.stringify(key.serialize());
+            await keys.set({ 'sender-key': { [keyId]: Buffer.from(serialized, 'utf-8') } });
         },
-        getOurRegistrationId: () => (creds.registrationId),
+        getOurRegistrationId: () => creds.registrationId,
         getOurIdentity: () => {
             const { signedIdentityKey } = creds;
             return {
                 privKey: Buffer.from(signedIdentityKey.private),
-                pubKey: (0, Utils_1.generateSignalPubKey)(signedIdentityKey.public),
+                pubKey: generateSignalPubKey(signedIdentityKey.public)
             };
         }
     };
 }
+//# sourceMappingURL=libsignal.js.map

package/lib/Socket/Client/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./abstract-socket-client"), exports);
-__exportStar(require("./mobile-socket-client"), exports);
-__exportStar(require("./web-socket-client"), exports);
+export * from './types.js';
+export * from './websocket.js';
+//# sourceMappingURL=index.js.map

package/lib/Socket/Client/types.js

@@ -0,0 +1,11 @@
+import { EventEmitter } from 'events';
+import { URL } from 'url';
+export class AbstractSocketClient extends EventEmitter {
+    constructor(url, config) {
+        super();
+        this.url = url;
+        this.config = config;
+        this.setMaxListeners(0);
+    }
+}
+//# sourceMappingURL=types.js.map

package/lib/Socket/Client/websocket.js

@@ -0,0 +1,50 @@
+import WebSocket from 'ws';
+import { DEFAULT_ORIGIN } from '../../Defaults/index.js';
+import { AbstractSocketClient } from './types.js';
+export class WebSocketClient extends AbstractSocketClient {
+    constructor() {
+        super(...arguments);
+        this.socket = null;
+    }
+    get isOpen() {
+        return this.socket?.readyState === WebSocket.OPEN;
+    }
+    get isClosed() {
+        return this.socket === null || this.socket?.readyState === WebSocket.CLOSED;
+    }
+    get isClosing() {
+        return this.socket === null || this.socket?.readyState === WebSocket.CLOSING;
+    }
+    get isConnecting() {
+        return this.socket?.readyState === WebSocket.CONNECTING;
+    }
+    async connect() {
+        if (this.socket) {
+            return;
+        }
+        this.socket = new WebSocket(this.url, {
+            origin: DEFAULT_ORIGIN,
+            headers: this.config.options?.headers,
+            handshakeTimeout: this.config.connectTimeoutMs,
+            timeout: this.config.connectTimeoutMs,
+            agent: this.config.agent
+        });
+        this.socket.setMaxListeners(0);
+        const events = ['close', 'error', 'upgrade', 'message', 'open', 'ping', 'pong', 'unexpected-response'];
+        for (const event of events) {
+            this.socket?.on(event, (...args) => this.emit(event, ...args));
+        }
+    }
+    async close() {
+        if (!this.socket) {
+            return;
+        }
+        this.socket.close();
+        this.socket = null;
+    }
+    send(str, cb) {
+        this.socket?.send(str, cb);
+        return Boolean(this.socket);
+    }
+}
+//# sourceMappingURL=websocket.js.map

package/lib/Socket/business.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeBusinessSocket = void 0;
-const business_1 = require("../Utils/business");
-const WABinary_1 = require("../WABinary");
-const generic_utils_1 = require("../WABinary/generic-utils");
-const messages_recv_1 = require("./messages-recv");
-const makeBusinessSocket = (config) => {
-    const sock = (0, messages_recv_1.makeMessagesRecvSocket)(config);
+import { parseCatalogNode, parseCollectionsNode, parseOrderDetailsNode, parseProductNode, toProductNode, uploadingNecessaryImagesOfProduct } from '../Utils/business.js';
+import { jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { getBinaryNodeChild } from '../WABinary/generic-utils.js';
+import { makeMessagesRecvSocket } from './messages-recv.js';
+export const makeBusinessSocket = (config) => {
+    const sock = makeMessagesRecvSocket(config);
     const { authState, query, waUploadToServer } = sock;
     const getCatalog = async ({ jid, limit, cursor }) => {
-        var _a;
-        jid = jid || ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id);
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        jid = jid || authState.creds.me?.id;
+        jid = jidNormalizedUser(jid);
         const queryParamNodes = [
             {
                 tag: 'limit',
@@ -27,7 +23,7 @@ const makeBusinessSocket = (config) => {
                 tag: 'height',
                 attrs: {},
                 content: Buffer.from('100')
-            },
+            }
         ];
         if (cursor) {
             queryParamNodes.push({
@@ -39,7 +35,7 @@ const makeBusinessSocket = (config) => {
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'w:biz:catalog'
             },
@@ -48,31 +44,30 @@ const makeBusinessSocket = (config) => {
                     tag: 'product_catalog',
                     attrs: {
                         jid,
-                        'allow_shop_source': 'true'
+                        allow_shop_source: 'true'
                     },
                     content: queryParamNodes
                 }
             ]
         });
-        return (0, business_1.parseCatalogNode)(result);
+        return parseCatalogNode(result);
     };
     const getCollections = async (jid, limit = 51) => {
-        var _a;
-        jid = jid || ((_a = authState.creds.me) === null || _a === void 0 ? void 0 : _a.id);
-        jid = (0, WABinary_1.jidNormalizedUser)(jid);
+        jid = jid || authState.creds.me?.id;
+        jid = jidNormalizedUser(jid);
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'w:biz:catalog',
-                'smax_id': '35'
+                smax_id: '35'
             },
             content: [
                 {
                     tag: 'collections',
                     attrs: {
-                        'biz_jid': jid,
+                        biz_jid: jid
                     },
                     content: [
                         {
@@ -99,16 +94,16 @@ const makeBusinessSocket = (config) => {
                 }
             ]
         });
-        return (0, business_1.parseCollectionsNode)(result);
+        return parseCollectionsNode(result);
     };
     const getOrderDetails = async (orderId, tokenBase64) => {
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'get',
                 xmlns: 'fb:thrift_iq',
-                'smax_id': '5'
+                smax_id: '5'
             },
             content: [
                 {
@@ -143,15 +138,15 @@ const makeBusinessSocket = (config) => {
                 }
             ]
         });
-        return (0, business_1.parseOrderDetailsNode)(result);
+        return parseOrderDetailsNode(result);
     };
     const productUpdate = async (productId, update) => {
-        update = await (0, business_1.uploadingNecessaryImagesOfProduct)(update, waUploadToServer);
-        const editNode = (0, business_1.toProductNode)(productId, update);
+        update = await uploadingNecessaryImagesOfProduct(update, waUploadToServer);
+        const editNode = toProductNode(productId, update);
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:biz:catalog'
             },
@@ -175,19 +170,19 @@ const makeBusinessSocket = (config) => {
                 }
             ]
         });
-        const productCatalogEditNode = (0, generic_utils_1.getBinaryNodeChild)(result, 'product_catalog_edit');
-        const productNode = (0, generic_utils_1.getBinaryNodeChild)(productCatalogEditNode, 'product');
-        return (0, business_1.parseProductNode)(productNode);
+        const productCatalogEditNode = getBinaryNodeChild(result, 'product_catalog_edit');
+        const productNode = getBinaryNodeChild(productCatalogEditNode, 'product');
+        return parseProductNode(productNode);
     };
     const productCreate = async (create) => {
         // ensure isHidden is defined
         create.isHidden = !!create.isHidden;
-        create = await (0, business_1.uploadingNecessaryImagesOfProduct)(create, waUploadToServer);
-        const createNode = (0, business_1.toProductNode)(undefined, create);
+        create = await uploadingNecessaryImagesOfProduct(create, waUploadToServer);
+        const createNode = toProductNode(undefined, create);
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:biz:catalog'
             },
@@ -211,15 +206,15 @@ const makeBusinessSocket = (config) => {
                 }
             ]
         });
-        const productCatalogAddNode = (0, generic_utils_1.getBinaryNodeChild)(result, 'product_catalog_add');
-        const productNode = (0, generic_utils_1.getBinaryNodeChild)(productCatalogAddNode, 'product');
-        return (0, business_1.parseProductNode)(productNode);
+        const productCatalogAddNode = getBinaryNodeChild(result, 'product_catalog_add');
+        const productNode = getBinaryNodeChild(productCatalogAddNode, 'product');
+        return parseProductNode(productNode);
     };
     const productDelete = async (productIds) => {
         const result = await query({
             tag: 'iq',
             attrs: {
-                to: WABinary_1.S_WHATSAPP_NET,
+                to: S_WHATSAPP_NET,
                 type: 'set',
                 xmlns: 'w:biz:catalog'
             },
@@ -241,9 +236,9 @@ const makeBusinessSocket = (config) => {
                 }
             ]
         });
-        const productCatalogDelNode = (0, generic_utils_1.getBinaryNodeChild)(result, 'product_catalog_delete');
+        const productCatalogDelNode = getBinaryNodeChild(result, 'product_catalog_delete');
         return {
-            deleted: +((productCatalogDelNode === null || productCatalogDelNode === void 0 ? void 0 : productCatalogDelNode.attrs.deleted_count) || 0)
+            deleted: +(productCatalogDelNode?.attrs.deleted_count || 0)
         };
     };
     return {
@@ -257,4 +252,4 @@ const makeBusinessSocket = (config) => {
         productUpdate
     };
 };
-exports.makeBusinessSocket = makeBusinessSocket;
+//# sourceMappingURL=business.js.map