@badzz88/baileys 8.5.7 → 8.5.8

package/lib/Signal/Group/group_cipher.js

@@ -1,89 +1,82 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.GroupCipher = void 0
-const Crypto_1 = require('../../Utils/crypto')
-const sender_key_message_1 = require('./sender-key-message')
-class GroupCipher {
-	constructor(senderKeyStore, senderKeyName) {
-		this.senderKeyStore = senderKeyStore
-		this.senderKeyName = senderKeyName
-	}
-	async encrypt(paddedPlaintext) {
-		const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName)
-		if (!record) {
-			throw new Error('No SenderKeyRecord found for encryption')
-		}
-		const senderKeyState = record.getSenderKeyState()
-		if (!senderKeyState) {
-			throw new Error('No session to encrypt message')
-		}
-		const iteration = senderKeyState.getSenderChainKey().getIteration()
-		const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1)
-		const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext)
-		const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(
-			senderKeyState.getKeyId(),
-			senderKey.getIteration(),
-			ciphertext,
-			senderKeyState.getSigningKeyPrivate()
-		)
-		await this.senderKeyStore.storeSenderKey(this.senderKeyName, record)
-		return senderKeyMessage.serialize()
-	}
-	async decrypt(senderKeyMessageBytes) {
-		const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName)
-		if (!record) {
-			throw new Error('No SenderKeyRecord found for decryption')
-		}
-		const senderKeyMessage = new sender_key_message_1.SenderKeyMessage(null, null, null, null, senderKeyMessageBytes)
-		const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId())
-		if (!senderKeyState) {
-			throw new Error('No session found to decrypt message')
-		}
-		senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic())
-		const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration())
-		const plaintext = await this.getPlainText(
-			senderKey.getIv(),
-			senderKey.getCipherKey(),
-			senderKeyMessage.getCipherText()
-		)
-		await this.senderKeyStore.storeSenderKey(this.senderKeyName, record)
-		return plaintext
-	}
-	getSenderKey(senderKeyState, iteration) {
-		let senderChainKey = senderKeyState.getSenderChainKey()
-		if (senderChainKey.getIteration() > iteration) {
-			if (senderKeyState.hasSenderMessageKey(iteration)) {
-				const messageKey = senderKeyState.removeSenderMessageKey(iteration)
-				if (!messageKey) {
-					throw new Error('No sender message key found for iteration')
-				}
-				return messageKey
-			}
-			throw new Error(`Received message with old counter: ${senderChainKey.getIteration()}, ${iteration}`)
-		}
-		if (iteration - senderChainKey.getIteration() > 2000) {
-			throw new Error('Over 2000 messages into the future!')
-		}
-		while (senderChainKey.getIteration() < iteration) {
-			senderKeyState.addSenderMessageKey(senderChainKey.getSenderMessageKey())
-			senderChainKey = senderChainKey.getNext()
-		}
-		senderKeyState.setSenderChainKey(senderChainKey.getNext())
-		return senderChainKey.getSenderMessageKey()
-	}
-	async getPlainText(iv, key, ciphertext) {
-		try {
-			return Buffer.from(Crypto_1.aesDecryptWithIV(ciphertext, key, iv))
-		} catch (e) {
-			throw new Error('InvalidMessageException')
-		}
-	}
-	async getCipherText(iv, key, plaintext) {
-		try {
-			return Buffer.from(Crypto_1.aesEncrypWithIV(plaintext, key, iv))
-		} catch (e) {
-			throw new Error('InvalidMessageException')
-		}
-	}
+import { decrypt, encrypt } from 'libsignal/src/crypto.js';
+import { SenderKeyMessage } from './sender-key-message.js';
+import { SenderKeyName } from './sender-key-name.js';
+import { SenderKeyRecord } from './sender-key-record.js';
+import { SenderKeyState } from './sender-key-state.js';
+export class GroupCipher {
+    constructor(senderKeyStore, senderKeyName) {
+        this.senderKeyStore = senderKeyStore;
+        this.senderKeyName = senderKeyName;
+    }
+    async encrypt(paddedPlaintext) {
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+        if (!record) {
+            throw new Error('No SenderKeyRecord found for encryption');
+        }
+        const senderKeyState = record.getSenderKeyState();
+        if (!senderKeyState) {
+            throw new Error('No session to encrypt message');
+        }
+        const iteration = senderKeyState.getSenderChainKey().getIteration();
+        const senderKey = this.getSenderKey(senderKeyState, iteration === 0 ? 0 : iteration + 1);
+        const ciphertext = await this.getCipherText(senderKey.getIv(), senderKey.getCipherKey(), paddedPlaintext);
+        const senderKeyMessage = new SenderKeyMessage(senderKeyState.getKeyId(), senderKey.getIteration(), ciphertext, senderKeyState.getSigningKeyPrivate());
+        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+        return senderKeyMessage.serialize();
+    }
+    async decrypt(senderKeyMessageBytes) {
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
+        if (!record) {
+            throw new Error('No SenderKeyRecord found for decryption');
+        }
+        const senderKeyMessage = new SenderKeyMessage(null, null, null, null, senderKeyMessageBytes);
+        const senderKeyState = record.getSenderKeyState(senderKeyMessage.getKeyId());
+        if (!senderKeyState) {
+            throw new Error('No session found to decrypt message');
+        }
+        senderKeyMessage.verifySignature(senderKeyState.getSigningKeyPublic());
+        const senderKey = this.getSenderKey(senderKeyState, senderKeyMessage.getIteration());
+        const plaintext = await this.getPlainText(senderKey.getIv(), senderKey.getCipherKey(), senderKeyMessage.getCipherText());
+        await this.senderKeyStore.storeSenderKey(this.senderKeyName, record);
+        return plaintext;
+    }
+    getSenderKey(senderKeyState, iteration) {
+        let senderChainKey = senderKeyState.getSenderChainKey();
+        if (senderChainKey.getIteration() > iteration) {
+            if (senderKeyState.hasSenderMessageKey(iteration)) {
+                const messageKey = senderKeyState.removeSenderMessageKey(iteration);
+                if (!messageKey) {
+                    throw new Error('No sender message key found for iteration');
+                }
+                return messageKey;
+            }
+            throw new Error(`Received message with old counter: ${senderChainKey.getIteration()}, ${iteration}`);
+        }
+        if (iteration - senderChainKey.getIteration() > 2000) {
+            throw new Error('Over 2000 messages into the future!');
+        }
+        while (senderChainKey.getIteration() < iteration) {
+            senderKeyState.addSenderMessageKey(senderChainKey.getSenderMessageKey());
+            senderChainKey = senderChainKey.getNext();
+        }
+        senderKeyState.setSenderChainKey(senderChainKey.getNext());
+        return senderChainKey.getSenderMessageKey();
+    }
+    async getPlainText(iv, key, ciphertext) {
+        try {
+            return decrypt(key, ciphertext, iv);
+        }
+        catch (e) {
+            throw new Error('InvalidMessageException');
+        }
+    }
+    async getCipherText(iv, key, plaintext) {
+        try {
+            return encrypt(key, plaintext, iv);
+        }
+        catch (e) {
+            throw new Error('InvalidMessageException');
+        }
+    }
 }
-exports.GroupCipher = GroupCipher
+//# sourceMappingURL=group_cipher.js.map

package/lib/Signal/Group/index.js

@@ -1,136 +1,12 @@
-'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.keyhelper =
-	exports.CiphertextMessage =
-	exports.SenderChainKey =
-	exports.SenderMessageKey =
-	exports.SenderKeyMessage =
-	exports.SenderKeyState =
-	exports.GroupCipher =
-	exports.SenderKeyName =
-	exports.SenderKeyRecord =
-	exports.SenderKeyDistributionMessage =
-	exports.GroupSessionBuilder =
-		void 0
-var group_session_builder_1 = require('./group-session-builder')
-Object.defineProperty(exports, 'GroupSessionBuilder', {
-	enumerable: true,
-	get: function () {
-		return group_session_builder_1.GroupSessionBuilder
-	}
-})
-var sender_key_distribution_message_1 = require('./sender-key-distribution-message')
-Object.defineProperty(exports, 'SenderKeyDistributionMessage', {
-	enumerable: true,
-	get: function () {
-		return sender_key_distribution_message_1.SenderKeyDistributionMessage
-	}
-})
-var sender_key_record_1 = require('./sender-key-record')
-Object.defineProperty(exports, 'SenderKeyRecord', {
-	enumerable: true,
-	get: function () {
-		return sender_key_record_1.SenderKeyRecord
-	}
-})
-var sender_key_name_1 = require('./sender-key-name')
-Object.defineProperty(exports, 'SenderKeyName', {
-	enumerable: true,
-	get: function () {
-		return sender_key_name_1.SenderKeyName
-	}
-})
-var group_cipher_1 = require('./group_cipher')
-Object.defineProperty(exports, 'GroupCipher', {
-	enumerable: true,
-	get: function () {
-		return group_cipher_1.GroupCipher
-	}
-})
-var sender_key_state_1 = require('./sender-key-state')
-Object.defineProperty(exports, 'SenderKeyState', {
-	enumerable: true,
-	get: function () {
-		return sender_key_state_1.SenderKeyState
-	}
-})
-var sender_key_message_1 = require('./sender-key-message')
-Object.defineProperty(exports, 'SenderKeyMessage', {
-	enumerable: true,
-	get: function () {
-		return sender_key_message_1.SenderKeyMessage
-	}
-})
-var sender_message_key_1 = require('./sender-message-key')
-Object.defineProperty(exports, 'SenderMessageKey', {
-	enumerable: true,
-	get: function () {
-		return sender_message_key_1.SenderMessageKey
-	}
-})
-var sender_chain_key_1 = require('./sender-chain-key')
-Object.defineProperty(exports, 'SenderChainKey', {
-	enumerable: true,
-	get: function () {
-		return sender_chain_key_1.SenderChainKey
-	}
-})
-var ciphertext_message_1 = require('./ciphertext-message')
-Object.defineProperty(exports, 'CiphertextMessage', {
-	enumerable: true,
-	get: function () {
-		return ciphertext_message_1.CiphertextMessage
-	}
-})
-exports.keyhelper = __importStar(require('./keyhelper'))
+export { GroupSessionBuilder } from './group-session-builder.js';
+export { SenderKeyDistributionMessage } from './sender-key-distribution-message.js';
+export { SenderKeyRecord } from './sender-key-record.js';
+export { SenderKeyName } from './sender-key-name.js';
+export { GroupCipher } from './group_cipher.js';
+export { SenderKeyState } from './sender-key-state.js';
+export { SenderKeyMessage } from './sender-key-message.js';
+export { SenderMessageKey } from './sender-message-key.js';
+export { SenderChainKey } from './sender-chain-key.js';
+export { CiphertextMessage } from './ciphertext-message.js';
+export * as keyhelper from './keyhelper.js';
+//# sourceMappingURL=index.js.map

package/lib/Signal/Group/keyhelper.js

@@ -1,73 +1,18 @@
-'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.generateSenderKey = generateSenderKey
-exports.generateSenderKeyId = generateSenderKeyId
-exports.generateSenderSigningKey = generateSenderSigningKey
-const nodeCrypto = __importStar(require('crypto'))
-const Crypto_1 = require('../../Utils/crypto')
-function generateSenderKey() {
-	return nodeCrypto.randomBytes(32)
+import * as nodeCrypto from 'crypto';
+import { generateKeyPair } from 'libsignal/src/curve.js';
+export function generateSenderKey() {
+    return nodeCrypto.randomBytes(32);
 }
-function generateSenderKeyId() {
-	return nodeCrypto.randomInt(2147483647)
+export function generateSenderKeyId() {
+    return nodeCrypto.randomInt(2147483647);
 }
-function generateSenderSigningKey(key) {
-	if (!key) {
-		key = Crypto_1.Curve.generateKeyPair()
-	}
-	return {
-		public: Crypto_1.generateSignalPubKey(key.public),
-		private: Buffer.from(key.private)
-	}
+export function generateSenderSigningKey(key) {
+    if (!key) {
+        key = generateKeyPair();
+    }
+    return {
+        public: Buffer.from(key.pubKey),
+        private: Buffer.from(key.privKey)
+    };
 }
+//# sourceMappingURL=keyhelper.js.map

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

@@ -1,32 +1,26 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.SenderChainKey = void 0
-const Crypto_1 = require('../../Utils/crypto')
-const sender_message_key_1 = require('./sender-message-key')
-class SenderChainKey {
-	constructor(iteration, chainKey) {
-		this.MESSAGE_KEY_SEED = Buffer.from([0x01])
-		this.CHAIN_KEY_SEED = Buffer.from([0x02])
-		this.iteration = iteration
-		this.chainKey = Buffer.from(chainKey)
-	}
-	getIteration() {
-		return this.iteration
-	}
-	getSenderMessageKey() {
-		return new sender_message_key_1.SenderMessageKey(
-			this.iteration,
-			this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey)
-		)
-	}
-	getNext() {
-		return new SenderChainKey(this.iteration + 1, this.getDerivative(this.CHAIN_KEY_SEED, this.chainKey))
-	}
-	getSeed() {
-		return this.chainKey
-	}
-	getDerivative(seed, key) {
-		return Buffer.from(Crypto_1.hmacSign(seed, key))
-	}
+import { calculateMAC } from 'libsignal/src/crypto.js';
+import { SenderMessageKey } from './sender-message-key.js';
+export class SenderChainKey {
+    constructor(iteration, chainKey) {
+        this.MESSAGE_KEY_SEED = Buffer.from([0x01]);
+        this.CHAIN_KEY_SEED = Buffer.from([0x02]);
+        this.iteration = iteration;
+        this.chainKey = Buffer.from(chainKey);
+    }
+    getIteration() {
+        return this.iteration;
+    }
+    getSenderMessageKey() {
+        return new SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey));
+    }
+    getNext() {
+        return new SenderChainKey(this.iteration + 1, this.getDerivative(this.CHAIN_KEY_SEED, this.chainKey));
+    }
+    getSeed() {
+        return this.chainKey;
+    }
+    getDerivative(seed, key) {
+        return calculateMAC(key, seed);
+    }
 }
-exports.SenderChainKey = SenderChainKey
+//# sourceMappingURL=sender-chain-key.js.map

package/lib/Signal/Group/sender-key-distribution-message.js

@@ -1,66 +1,63 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.SenderKeyDistributionMessage = void 0
-const index_js_1 = require('../../../WAProto/index.js')
-const ciphertext_message_1 = require('./ciphertext-message')
-class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
-	constructor(id, iteration, chainKey, signatureKey, serialized) {
-		super()
-		if (serialized) {
-			try {
-				const message = serialized.slice(1)
-				const distributionMessage = index_js_1.proto.SenderKeyDistributionMessage.decode(message).toJSON()
-				this.serialized = serialized
-				this.id = distributionMessage.id
-				this.iteration = distributionMessage.iteration
-				this.chainKey =
-					typeof distributionMessage.chainKey === 'string'
-						? Buffer.from(distributionMessage.chainKey, 'base64')
-						: distributionMessage.chainKey
-				this.signatureKey =
-					typeof distributionMessage.signingKey === 'string'
-						? Buffer.from(distributionMessage.signingKey, 'base64')
-						: distributionMessage.signingKey
-			} catch (e) {
-				throw new Error(String(e))
-			}
-		} else {
-			const version = this.intsToByteHighAndLow(this.CURRENT_VERSION, this.CURRENT_VERSION)
-			this.id = id
-			this.iteration = iteration
-			this.chainKey = chainKey
-			this.signatureKey = signatureKey
-			const message = index_js_1.proto.SenderKeyDistributionMessage.encode(
-				index_js_1.proto.SenderKeyDistributionMessage.create({
-					id,
-					iteration,
-					chainKey,
-					signingKey: this.signatureKey
-				})
-			).finish()
-			this.serialized = Buffer.concat([Buffer.from([version]), message])
-		}
-	}
-	intsToByteHighAndLow(highValue, lowValue) {
-		return (((highValue << 4) | lowValue) & 0xff) % 256
-	}
-	serialize() {
-		return this.serialized
-	}
-	getType() {
-		return this.SENDERKEY_DISTRIBUTION_TYPE
-	}
-	getIteration() {
-		return this.iteration
-	}
-	getChainKey() {
-		return this.chainKey
-	}
-	getSignatureKey() {
-		return this.signatureKey
-	}
-	getId() {
-		return this.id
-	}
+import { proto } from '../../../WAProto/index.js';
+import { CiphertextMessage } from './ciphertext-message.js';
+export class SenderKeyDistributionMessage extends CiphertextMessage {
+    constructor(id, iteration, chainKey, signatureKey, serialized) {
+        super();
+        if (serialized) {
+            try {
+                const message = serialized.slice(1);
+                const distributionMessage = proto.SenderKeyDistributionMessage.decode(message).toJSON();
+                this.serialized = serialized;
+                this.id = distributionMessage.id;
+                this.iteration = distributionMessage.iteration;
+                this.chainKey =
+                    typeof distributionMessage.chainKey === 'string'
+                        ? Buffer.from(distributionMessage.chainKey, 'base64')
+                        : distributionMessage.chainKey;
+                this.signatureKey =
+                    typeof distributionMessage.signingKey === 'string'
+                        ? Buffer.from(distributionMessage.signingKey, 'base64')
+                        : distributionMessage.signingKey;
+            }
+            catch (e) {
+                throw new Error(String(e));
+            }
+        }
+        else {
+            const version = this.intsToByteHighAndLow(this.CURRENT_VERSION, this.CURRENT_VERSION);
+            this.id = id;
+            this.iteration = iteration;
+            this.chainKey = chainKey;
+            this.signatureKey = signatureKey;
+            const message = proto.SenderKeyDistributionMessage.encode(proto.SenderKeyDistributionMessage.create({
+                id,
+                iteration,
+                chainKey,
+                signingKey: this.signatureKey
+            })).finish();
+            this.serialized = Buffer.concat([Buffer.from([version]), message]);
+        }
+    }
+    intsToByteHighAndLow(highValue, lowValue) {
+        return (((highValue << 4) | lowValue) & 0xff) % 256;
+    }
+    serialize() {
+        return this.serialized;
+    }
+    getType() {
+        return this.SENDERKEY_DISTRIBUTION_TYPE;
+    }
+    getIteration() {
+        return this.iteration;
+    }
+    getChainKey() {
+        return this.chainKey;
+    }
+    getSignatureKey() {
+        return this.signatureKey;
+    }
+    getId() {
+        return this.id;
+    }
 }
-exports.SenderKeyDistributionMessage = SenderKeyDistributionMessage
+//# sourceMappingURL=sender-key-distribution-message.js.map