@hansaka02/baileys 7.3.4 → 7.3.6

package/lib/Defaults/baileys-version.json

@@ -1,3 +1,3 @@
 {
-    "version": [2, 3000, 1030003753]
-}
+    "version": [2, 3000, 1030831524]
+}

package/lib/Defaults/connection.js

@@ -40,7 +40,7 @@ const DEFAULT_CONNECTION_CONFIG = {
         patch: false,
         snapshot: false,
     },
-    countryCode: 'EN',
+    countryCode: 'US',
     getMessage: async () => undefined,
     cachedGroupMetadata: async () => undefined,
     makeSignalRepository: makeLibSignalRepository

package/lib/Defaults/constants.js

@@ -10,6 +10,14 @@ const DEFAULT_ORIGIN = 'https://web.whatsapp.com'
 
 const PHONE_CONNECTION_CB = 'CB:Pong'
 
+const WA_ADV_ACCOUNT_SIG_PREFIX = Buffer.from([6, 0])
+
+const WA_ADV_DEVICE_SIG_PREFIX = Buffer.from([6, 1])
+
+const WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX = Buffer.from([6, 5])
+
+const WA_ADV_HOSTED_DEVICE_SIG_PREFIX = Buffer.from([6, 6])
+
 const WA_DEFAULT_EPHEMERAL = 7 * 24 * 60 * 60
 
 const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
@@ -25,7 +33,7 @@ const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{
 
 const MIN_PREKEY_COUNT = 5
 
-const INITIAL_PREKEY_COUNT = 30
+const INITIAL_PREKEY_COUNT = 812
 
 const UPLOAD_TIMEOUT = 30000 // 30 seconds
 
@@ -47,6 +55,10 @@ module.exports = {
   PHONENUMBER_MCC, 
   DEFAULT_ORIGIN, 
   PHONE_CONNECTION_CB, 
+  WA_ADV_ACCOUNT_SIG_PREFIX, 
+  WA_ADV_DEVICE_SIG_PREFIX, 
+  WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX, 
+  WA_ADV_HOSTED_DEVICE_SIG_PREFIX, 
   WA_DEFAULT_EPHEMERAL, 
   NOISE_MODE, 
   DICT_VERSION, 

package/lib/Defaults/history.js

@@ -9,7 +9,9 @@ const PROCESSABLE_HISTORY_TYPES = [
     proto.Message.HistorySyncType.PUSH_NAME,
     proto.Message.HistorySyncType.RECENT,
     proto.Message.HistorySyncType.FULL,
-    proto.Message.HistorySyncType.ON_DEMAND
+    proto.Message.HistorySyncType.ON_DEMAND, 
+    proto.HistorySync.HistorySyncType.NON_BLOCKING_DATA, 
+    proto.HistorySync.HistorySyncType.INITIAL_STATUS_V3
 ]
 
 module.exports = {

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

@@ -10,20 +10,7 @@ class SenderChainKey {
         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

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

@@ -56,10 +56,10 @@ class SenderKeyDistributionMessage extends CiphertextMessage {
         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-record.js

@@ -38,17 +38,8 @@ class SenderKeyRecord {
         return this.senderKeyStates.map(state => state.getStructure())
     }
     static deserialize(data) {
-        let parsed
-        if (typeof data === 'string') {
-            parsed = JSON.parse(data, BufferJSON.reviver)
-        }
-        else if (data instanceof Uint8Array) {
-            const str = Buffer.from(data).toString('utf-8')
-            parsed = JSON.parse(str, 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

@@ -9,16 +9,6 @@ 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: []
             }
         }
@@ -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 SenderMessageKey(messageKey.iteration, messageKey.seed)
         }
+        
         return null
     }
     getStructure() {