@pontalabs/baileys 1.0.11 → 1.1.0

package/lib/Signal/Group/group_cipher.js

@@ -1,111 +1,104 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const crypto_1 = require("libsignal/src/crypto")
-const sender_key_message_1 = require("./sender-key-message")
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { decrypt: decrypt, encrypt: encrypt } = require("libsignal/src/crypto");
+const { SenderKeyMessage: SenderKeyMessage } = require("./sender-key-message");
 class GroupCipher {
     constructor(senderKeyStore, senderKeyName) {
-        this.senderKeyStore = senderKeyStore
-        this.senderKeyName = senderKeyName
+        this.senderKeyStore = senderKeyStore;
+        this.senderKeyName = senderKeyName;
     }
     async encrypt(paddedPlaintext) {
-        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName)
-        
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
         if (!record) {
-            throw new Error('No SenderKeyRecord found for encryption')
+            throw new Error("No SenderKeyRecord found for encryption");
         }
-        
-        const senderKeyState = record.getSenderKeyState()
-        
+        const senderKeyState = record.getSenderKeyState();
         if (!senderKeyState) {
-            throw new Error('No session to encrypt message')
+            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()
+        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)
-        
+        const record = await this.senderKeyStore.loadSenderKey(this.senderKeyName);
         if (!record) {
-            throw new Error('No SenderKeyRecord found for decryption')
+            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())
-        
+        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');
+            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
+        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()
-        
+        let senderChainKey = senderKeyState.getSenderChainKey();
         if (senderChainKey.getIteration() > iteration) {
             if (senderKeyState.hasSenderMessageKey(iteration)) {
-                const messageKey = senderKeyState.removeSenderMessageKey(iteration)
-                
+                const messageKey = senderKeyState.removeSenderMessageKey(iteration);
                 if (!messageKey) {
-                    throw new Error('No sender message key found for iteration')
+                    throw new Error("No sender message key found for iteration");
                 }
-                
-                return messageKey
+                return messageKey;
             }
-            
-            throw new Error(`Received message with old counter: ${senderChainKey.getIteration()}, ${iteration}`)
+            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!');
+        if (iteration - senderChainKey.getIteration() > 2e3) {
+            throw new Error("Over 2000 messages into the future!");
         }
-        
         while (senderChainKey.getIteration() < iteration) {
-            senderKeyState.addSenderMessageKey(senderChainKey.getSenderMessageKey())
-            senderChainKey = senderChainKey.getNext()
+            senderKeyState.addSenderMessageKey(senderChainKey.getSenderMessageKey());
+            senderChainKey = senderChainKey.getNext();
         }
-        
-        senderKeyState.setSenderChainKey(senderChainKey.getNext())
-        
-        return senderChainKey.getSenderMessageKey()
+        senderKeyState.setSenderChainKey(senderChainKey.getNext());
+        return senderChainKey.getSenderMessageKey();
     }
     async getPlainText(iv, key, ciphertext) {
         try {
-            return crypto_1.decrypt(key, ciphertext, iv)
-        }
-        catch (e) {
-            throw new Error('InvalidMessageException')
+            return decrypt(key, ciphertext, iv);
+        } catch (e) {
+            throw new Error("InvalidMessageException");
         }
     }
     async getCipherText(iv, key, plaintext) {
         try {
-            const ivBuffer = typeof iv === 'string' ? Buffer.from(iv, 'base64') : iv
-            const keyBuffer = typeof key === 'string' ? Buffer.from(key, 'base64') : key
-            const plaintextBuffer = typeof plaintext === 'string' ? Buffer.from(plaintext) : plaintext
-            return crypto_1.encrypt(keyBuffer, plaintextBuffer, ivBuffer)
-        }
-        catch (e) {
-            throw new Error('InvalidMessageException')
+            const ivBuffer = typeof iv === "string" ? Buffer.from(iv, "base64") : iv;
+            const keyBuffer = typeof key === "string" ? Buffer.from(key, "base64") : key;
+            const plaintextBuffer =
+                typeof plaintext === "string" ? Buffer.from(plaintext) : plaintext;
+            return encrypt(keyBuffer, plaintextBuffer, ivBuffer);
+        } catch (e) {
+            throw new Error("InvalidMessageException");
         }
     }
 }
-
-module.exports = {
-  GroupCipher
-}
+module.exports = { GroupCipher: GroupCipher };

package/lib/Signal/Group/index.js

@@ -1,61 +1,42 @@
-"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
+"use strict";
+const __createBinding =
+    (this && this.__createBinding) ||
+    (Object.create
+        ? function (o, m, k, k2) {
+              if (k2 === undefined) k2 = k;
+              let 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];
+          });
+const __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);
+            }
         }
-        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"))
+    };
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ciphertext-message"), exports);
+__exportStar(require("./group-session-builder"), exports);
+__exportStar(require("./group_cipher"), exports);
+__exportStar(require("./keyhelper"), exports);
+__exportStar(require("./sender-chain-key"), exports);
+__exportStar(require("./sender-key-distribution-message"), exports);
+__exportStar(require("./sender-key-message"), exports);
+__exportStar(require("./sender-key-name"), exports);
+__exportStar(require("./sender-key-record"), exports);
+__exportStar(require("./sender-key-state"), exports);
+__exportStar(require("./sender-message-key"), exports);

package/lib/Signal/Group/keyhelper.js

@@ -1,66 +1,21 @@
-"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 })
-
-const nodeCrypto = __importStar(require("crypto"))
-const curve_1 = require("libsignal/src/curve")
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { randomInt: randomInt, randomBytes: randomBytes } = require("crypto");
+const { generateKeyPair: generateKeyPair } = require("libsignal/src/curve");
 function generateSenderKey() {
-    return nodeCrypto.randomBytes(32)
+    return randomBytes(32);
 }
-
 function generateSenderKeyId() {
-    return nodeCrypto.randomInt(2147483647)
+    return randomInt(2147483647);
 }
-
 function generateSenderSigningKey(key) {
     if (!key) {
-        key = curve_1.generateKeyPair()
-    }
-    return {
-        public: Buffer.from(key.pubKey),
-        private: Buffer.from(key.privKey)
+        key = generateKeyPair();
     }
+    return { public: Buffer.from(key.pubKey), private: Buffer.from(key.privKey) };
 }
-
 module.exports = {
-  generateSenderKey, 
-  generateSenderKeyId, 
-  generateSenderSigningKey
-}
+    generateSenderKey: generateSenderKey,
+    generateSenderKeyId: generateSenderKeyId,
+    generateSenderSigningKey: generateSenderSigningKey,
+};

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

@@ -1,47 +1,34 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const crypto_1 = require("libsignal/src/crypto")
-const sender_message_key_1 = require("./sender-message-key")
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { calculateMAC: calculateMAC } = require("libsignal/src/crypto");
+const { SenderMessageKey: SenderMessageKey } = 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
-        if (Buffer.isBuffer(chainKey)) {
-        	// backported from @MartinSchere's PR
-            this.chainKey = chainKey
-        }
-        else if (chainKey instanceof Uint8Array) {
-            this.chainKey = Buffer.from(chainKey) 
-        }
-        else if (chainKey && typeof chainKey === 'object') {
-            // backported from @MartinSchere (#1741)
-            this.chainKey = Buffer.from(Object.values(chainKey)) // temp fix // backported from @MartinSchere (#1741)
-        }
-        else {
-            this.chainKey = Buffer.alloc(0)
-        }
+        this.MESSAGE_KEY_SEED = Buffer.from([1]);
+        this.CHAIN_KEY_SEED = Buffer.from([2]);
+        this.iteration = iteration;
+        this.chainKey = Buffer.from(chainKey);
     }
     getIteration() {
-        return this.iteration
+        return this.iteration;
     }
     getSenderMessageKey() {
-        return new sender_message_key_1.SenderMessageKey(this.iteration, this.getDerivative(this.MESSAGE_KEY_SEED, this.chainKey))
+        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))
+        return new SenderChainKey(
+            this.iteration + 1,
+            this.getDerivative(this.CHAIN_KEY_SEED, this.chainKey)
+        );
     }
     getSeed() {
-        return this.chainKey
+        return this.chainKey;
     }
     getDerivative(seed, key) {
-        return (0, crypto_1.calculateMAC)(key, seed)
+        return calculateMAC(key, seed);
     }
 }
-
-module.exports = {
-  SenderChainKey
-}
+module.exports = { SenderChainKey: SenderChainKey };

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

@@ -1,71 +1,66 @@
-"use strict"
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const WAProto_1 = require("../../../WAProto")
-const ciphertext_message_1 = require("./ciphertext-message")
-
-class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { proto: proto } = require("../../../WAProto");
+const { CiphertextMessage: CiphertextMessage } = require("./ciphertext-message");
+class SenderKeyDistributionMessage extends CiphertextMessage {
     constructor(id, iteration, chainKey, signatureKey, serialized) {
-        super()
+        super();
         if (serialized) {
             try {
-                const message = serialized.slice(1)
-                const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON()
-                this.serialized = serialized
-                this.id = distributionMessage.id
-                this.iteration = distributionMessage.iteration
+                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
+                    typeof distributionMessage.chainKey === "string"
+                        ? Buffer.from(distributionMessage.chainKey, "base64")
+                        : distributionMessage.chainKey;
                 this.signatureKey =
-                    typeof distributionMessage.signingKey === 'string'
-                        ? Buffer.from(distributionMessage.signingKey, 'base64')
-                        : distributionMessage.signingKey
+                    typeof distributionMessage.signingKey === "string"
+                        ? Buffer.from(distributionMessage.signingKey, "base64")
+                        : distributionMessage.signingKey;
+            } catch (e) {
+                throw new Error(String(e));
             }
-            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 = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
-                id,
-                iteration,
-                chainKey,
-                signingKey: this.signatureKey
-            })).finish()
-            this.serialized = Buffer.concat([Buffer.from([version]), message])
+        } 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: id,
+                    iteration: iteration,
+                    chainKey: chainKey,
+                    signingKey: this.signatureKey,
+                })
+            ).finish();
+            this.serialized = Buffer.concat([Buffer.from([version]), message]);
         }
     }
     intsToByteHighAndLow(highValue, lowValue) {
-        return (((highValue << 4) | lowValue) & 0xff) % 256
+        return (((highValue << 4) | lowValue) & 255) % 256;
     }
     serialize() {
-        return this.serialized
+        return this.serialized;
     }
     getType() {
-        return this.SENDERKEY_DISTRIBUTION_TYPE
+        return this.SENDERKEY_DISTRIBUTION_TYPE;
     }
     getIteration() {
-        return this.iteration
+        return this.iteration;
     }
     getChainKey() {
-        return typeof this.chainKey === 'string' ? Buffer.from(this.chainKey, 'base64') : this.chainKey
+        return this.chainKey;
     }
     getSignatureKey() {
-        return typeof this.signatureKey === 'string' ? Buffer.from(this.signatureKey, 'base64') : this.signatureKey
+        return this.signatureKey;
     }
     getId() {
-        return this.id
+        return this.id;
     }
 }
-
-module.exports = {
-  SenderKeyDistributionMessage
-}
+module.exports = { SenderKeyDistributionMessage: SenderKeyDistributionMessage };