@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Signal/Group/keyhelper.js

@@ -1,57 +1,24 @@
 "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("@itsukichan/libsignal-node/src/curve")
+const { 
+  randomInt, 
+  randomBytes 
+} = require("crypto")
+const { generateKeyPair } = require("@itsukichan/libsignal-node/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()
+        key = generateKeyPair()
     }
     return {
         public: Buffer.from(key.pubKey),

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

@@ -2,34 +2,21 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const crypto_1 = require("@itsukichan/libsignal-node/src/crypto")
-const sender_message_key_1 = require("./sender-message-key")
+const { calculateMAC } = require("@itsukichan/libsignal-node/src/crypto")
+const { 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.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))
+        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))
@@ -38,7 +25,7 @@ class SenderChainKey {
         return this.chainKey
     }
     getDerivative(seed, key) {
-        return (0, crypto_1.calculateMAC)(key, seed)
+        return calculateMAC(key, seed)
     }
 }
 

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

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const WAProto_1 = require("../../../WAProto")
-const ciphertext_message_1 = require("./ciphertext-message")
+const { proto } = require("../../../WAProto")
+const { CiphertextMessage } = require("./ciphertext-message")
 
-class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessage {
+class SenderKeyDistributionMessage extends CiphertextMessage {
     constructor(id, iteration, chainKey, signatureKey, serialized) {
         super()
         if (serialized) {
             try {
                 const message = serialized.slice(1)
-                const distributionMessage = WAProto_1.proto.SenderKeyDistributionMessage.decode(message).toJSON()
+                const distributionMessage = proto.SenderKeyDistributionMessage.decode(message).toJSON()
                 this.serialized = serialized
                 this.id = distributionMessage.id
                 this.iteration = distributionMessage.iteration
@@ -34,7 +34,7 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
             this.iteration = iteration
             this.chainKey = chainKey
             this.signatureKey = signatureKey
-            const message = WAProto_1.proto.SenderKeyDistributionMessage.encode(WAProto_1.proto.SenderKeyDistributionMessage.create({
+            const message = proto.SenderKeyDistributionMessage.encode(proto.SenderKeyDistributionMessage.create({
                 id,
                 iteration,
                 chainKey,
@@ -56,10 +56,10 @@ class SenderKeyDistributionMessage extends ciphertext_message_1.CiphertextMessag
         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

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

@@ -1,11 +1,15 @@
 "use strict"
+
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const curve_1 = require("@itsukichan/libsignal-node/src/curve")
-const WAProto_1 = require("../../../WAProto")
-const ciphertext_message_1 = require("./ciphertext-message")
+const {
+  verifySignature, 
+  calculateSignature
+} = require("@itsukichan/libsignal-node/src/curve")
+const { proto } = require("../../../WAProto")
+const { CiphertextMessage } = require("./ciphertext-message")
 
-class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
+class SenderKeyMessage extends CiphertextMessage {
     constructor(keyId, iteration, ciphertext, signatureKey, serialized) {
         super()
         this.SIGNATURE_LENGTH = 64
@@ -13,7 +17,7 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
             const version = serialized[0]
             const message = serialized.slice(1, serialized.length - this.SIGNATURE_LENGTH)
             const signature = serialized.slice(-1 * this.SIGNATURE_LENGTH)
-            const senderKeyMessage = WAProto_1.proto.SenderKeyMessage.decode(message).toJSON()
+            const senderKeyMessage = proto.SenderKeyMessage.decode(message).toJSON()
             this.serialized = serialized
             this.messageVersion = (version & 0xff) >> 4
             this.keyId = senderKeyMessage.id
@@ -27,7 +31,7 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
         else {
             const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256
             const ciphertextBuffer = Buffer.from(ciphertext)
-            const message = WAProto_1.proto.SenderKeyMessage.encode(WAProto_1.proto.SenderKeyMessage.create({
+            const message = proto.SenderKeyMessage.encode(proto.SenderKeyMessage.create({
                 id: keyId,
                 iteration: iteration,
                 ciphertext: ciphertextBuffer
@@ -53,12 +57,12 @@ class SenderKeyMessage extends ciphertext_message_1.CiphertextMessage {
     verifySignature(signatureKey) {
         const part1 = this.serialized.slice(0, this.serialized.length - this.SIGNATURE_LENGTH)
         const part2 = this.serialized.slice(-1 * this.SIGNATURE_LENGTH)
-        const res = curve_1.verifySignature(signatureKey, part1, part2)
+        const res = verifySignature(signatureKey, part1, part2)
         if (!res)
             throw new Error('Invalid signature!')
     }
     getSignature(signatureKey, serialized) {
-        return Buffer.from(curve_1.calculateSignature(signatureKey, serialized))
+        return Buffer.from(calculateSignature(signatureKey, serialized))
     }
     serialize() {
         return this.serialized

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const generics_1 = require("../../Utils/generics")
-const sender_key_state_1 = require("./sender-key-state")
+const { BufferJSON } = require("../../Utils/generics")
+const { SenderKeyState } = require("./sender-key-state")
 
 class SenderKeyRecord {
     constructor(serialized) {
@@ -11,7 +11,7 @@ class SenderKeyRecord {
         this.senderKeyStates = []
         if (serialized) {
             for (const structure of serialized) {
-                this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(null, null, null, null, null, null, structure))
+                this.senderKeyStates.push(new SenderKeyState(null, null, null, null, null, null, structure))
             }
         }
     }
@@ -25,30 +25,21 @@ class SenderKeyRecord {
         return this.senderKeyStates.find(state => state.getKeyId() === keyId)
     }
     addSenderKeyState(id, iteration, chainKey, signatureKey) {
-        this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, null, signatureKey))
+        this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, null, signatureKey))
         if (this.senderKeyStates.length > this.MAX_STATES) {
             this.senderKeyStates.shift()
         }
     }
     setSenderKeyState(id, iteration, chainKey, keyPair) {
         this.senderKeyStates.length = 0
-        this.senderKeyStates.push(new sender_key_state_1.SenderKeyState(id, iteration, chainKey, keyPair))
+        this.senderKeyStates.push(new SenderKeyState(id, iteration, chainKey, keyPair))
     }
     serialize() {
         return this.senderKeyStates.map(state => state.getStructure())
     }
     static deserialize(data) {
-        let parsed
-        if (typeof data === 'string') {
-            parsed = JSON.parse(data, generics_1.BufferJSON.reviver)
-        }
-        else if (data instanceof Uint8Array) {
-            const str = Buffer.from(data).toString('utf-8')
-            parsed = JSON.parse(str, generics_1.BufferJSON.reviver)
-        }
-        else {
-            parsed = data
-        }
+        const str = Buffer.from(data).toString('utf-8')
+        const parsed = JSON.parse(str, BufferJSON.reviver)
         return new SenderKeyRecord(parsed)
     }
 }

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

@@ -2,23 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const sender_chain_key_1 = require("./sender-chain-key")
-const sender_message_key_1 = require("./sender-message-key")
+const { SenderChainKey } = require("./sender-chain-key")
+const { SenderMessageKey } = require("./sender-message-key")
 
 class SenderKeyState {
     constructor(id, iteration, chainKey, signatureKeyPair, signatureKeyPublic, signatureKeyPrivate, senderKeyStateStructure) {
         this.MAX_MESSAGE_KEYS = 2000
         
-        const toBuffer = (val) => {
-            if (!val)
-                return Buffer.alloc(0)
-            if (typeof val === 'string')
-                return Buffer.from(val, 'base64')
-            if (val instanceof Uint8Array || Array.isArray(val))
-                return Buffer.from(val)
-            return Buffer.alloc(0)
-        }
-        
         if (senderKeyStateStructure) {
             this.senderKeyStateStructure = {
                 ...senderKeyStateStructure,
@@ -32,22 +22,17 @@ class SenderKeyState {
                 signatureKeyPublic = signatureKeyPair.public
                 signatureKeyPrivate = signatureKeyPair.private
             }
-            chainKey = typeof chainKey === 'string' ? Buffer.from(chainKey, 'base64') : chainKey
-            
-            const senderChainKeyStructure = {
-                iteration: iteration || 0,
-                seed: chainKey ? toBuffer(chainKey) : Buffer.alloc(0)
-            }
-            
-            const signingKeyStructure = {
-                public: toBuffer(signatureKeyPublic),
-                private: signatureKeyPrivate ? toBuffer(signatureKeyPrivate) : undefined
-            }
             
             this.senderKeyStateStructure = {
                 senderKeyId: id || 0,
-                senderChainKey: senderChainKeyStructure,
-                senderSigningKey: signingKeyStructure,
+                senderChainKey: {
+                    iteration: iteration || 0,
+                    seed: Buffer.from(chainKey || [])
+                },
+                senderSigningKey: {
+                    public: Buffer.from(signatureKeyPublic || []),
+                    private: Buffer.from(signatureKeyPrivate || [])
+                },
                 senderMessageKeys: []
             }
         }
@@ -56,7 +41,7 @@ class SenderKeyState {
         return this.senderKeyStateStructure.senderKeyId
     }
     getSenderChainKey() {
-        return new sender_chain_key_1.SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed)
+        return new SenderChainKey(this.senderKeyStateStructure.senderChainKey.iteration, this.senderKeyStateStructure.senderChainKey.seed)
     }
     setSenderChainKey(chainKey) {
         this.senderKeyStateStructure.senderChainKey = {
@@ -65,25 +50,7 @@ class SenderKeyState {
         }
     }
     getSigningKeyPublic() {
-        let key = this.senderKeyStateStructure.senderSigningKey.public
-        
-        // normalize into Buffer
-        if (!Buffer.isBuffer(key)) {
-            if (key instanceof Uint8Array) {
-                key = Buffer.from(key)
-            }
-            else if (typeof key === 'string') {
-                key = Buffer.from(key, 'base64')
-            }
-            else if (key && typeof key === 'object') {
-                return Buffer.from(Object.values(key)) // temp fix // inspired by @MartinSchere 's #1741
-            }
-            else {
-                key = Buffer.from(key || [])
-            }
-        }
-        
-        const publicKey = key
+        const publicKey = Buffer.from(this.senderKeyStateStructure.senderSigningKey.public)
         
         if (publicKey.length === 32) {
             const fixed = Buffer.alloc(33)
@@ -98,21 +65,6 @@ class SenderKeyState {
     }
     getSigningKeyPrivate() {
         const privateKey = this.senderKeyStateStructure.senderSigningKey.private
-        if (!privateKey) {
-            return undefined
-        }
-        if (Buffer.isBuffer(privateKey)) {
-            return privateKey
-        }
-        else if (privateKey instanceof Uint8Array) {
-            return Buffer.from(privateKey)
-        }
-        else if (privateKey && typeof privateKey === 'object') {
-            return Buffer.from(Object.values(privateKey)) // temp fix // inspired by @MartinSchere 's #1741
-        }
-        else if (typeof privateKey === 'string') {
-            return Buffer.from(privateKey, 'base64')
-        }
         return Buffer.from(privateKey || [])
     }
     hasSenderMessageKey(iteration) {
@@ -130,11 +82,13 @@ class SenderKeyState {
     }
     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 sender_message_key_1.SenderMessageKey(messageKey.iteration, messageKey.seed)
+            return new SenderMessageKey(messageKey.iteration, messageKey.seed)
         }
+        
         return null
     }
     getStructure() {

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

@@ -1,11 +1,11 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const crypto_1 = require("@itsukichan/libsignal-node/src/crypto")
+const { deriveSecrets } = require("@itsukichan/libsignal-node/src/crypto")
 
 class SenderMessageKey {
     constructor(iteration, seed) {
-        const derivative = (0, crypto_1.deriveSecrets)(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'))
+        const derivative = deriveSecrets(seed, Buffer.alloc(32), Buffer.from('WhisperGroup'))
         const keys = new Uint8Array(32)
         keys.set(new Uint8Array(derivative[0].slice(16)))
         keys.set(new Uint8Array(derivative[1].slice(0, 16)), 16)