@hansaka02/baileys 7.3.2 → 7.3.4

package/lib/Store/make-cache-manager-store.js

@@ -1,36 +1,35 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const cache_manager_1 = require("cache-manager")
-const WAProto_1 = require("../../WAProto")
-const Utils_1 = require("../Utils")
-const logger_1 = __importDefault(require("../Utils/logger"))
+const { caching } = require("cache-manager")
+const { proto } = require("../../WAProto")
+const {
+  BufferJSON, 
+  initAuthCreds
+} = require("../Utils")
+const { default: logger } = require("../Utils/logger")
 
 const makeCacheManagerAuthState = async (store, sessionKey) => {
     const defaultKey = (file) => `${sessionKey}:${file}`
-    const databaseConn = await cache_manager_1.caching(store)
+    const databaseConn = await caching(store)
     const writeData = async (file, data) => {
         let ttl = undefined
         if (file === 'creds') {
             ttl = 63115200 // 2 years
         }
-        await databaseConn.set(defaultKey(file), JSON.stringify(data, Utils_1.BufferJSON.replacer), ttl)
+        await databaseConn.set(defaultKey(file), JSON.stringify(data, BufferJSON.replacer), ttl)
     }
     const readData = async (file) => {
         try {
             const data = await databaseConn.get(defaultKey(file))
             if (data) {
-                return JSON.parse(data, Utils_1.BufferJSON.reviver)
+                return JSON.parse(data, BufferJSON.reviver)
             }
             return null
         }
         catch (error) {
-            logger_1.default.error(error)
+            logger.error(error)
             return null
         }
     }
@@ -39,7 +38,7 @@ const makeCacheManagerAuthState = async (store, sessionKey) => {
             return await databaseConn.del(defaultKey(file))
         }
         catch (_a) {
-            logger_1.default.error(`Error removing ${file} from session ${sessionKey}`)
+            logger.error(`Error removing ${file} from session ${sessionKey}`)
         }
     }
     const clearState = async () => {
@@ -50,7 +49,7 @@ const makeCacheManagerAuthState = async (store, sessionKey) => {
         catch (err) {
         }
     }
-    const creds = (await readData('creds')) || (0, Utils_1.initAuthCreds)()
+    const creds = (await readData('creds')) || initAuthCreds()
     return {
         clearState,
         saveCreds: () => writeData('creds', creds),
@@ -62,7 +61,7 @@ const makeCacheManagerAuthState = async (store, sessionKey) => {
                     await Promise.all(ids.map(async (id) => {
                         let value = await readData(`${type}-${id}`)
                         if (type === 'app-state-sync-key' && value) {
-                            value = WAProto_1.proto.Message.AppStateSyncKeyData.fromObject(value)
+                            value = proto.Message.AppStateSyncKeyData.fromObject(value)
                         }
                         data[id] = value
                     }))

package/lib/Store/make-in-memory-store.js

@@ -1,18 +1,22 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const WAProto_1 = require("../../WAProto")
-const Defaults_1 = require("../Defaults")
-const LabelAssociation_1 = require("../Types/LabelAssociation")
-const Utils_1 = require("../Utils")
-const WABinary_1 = require("../WABinary")
-const Store_1 = require("./make-ordered-dictionary")
-const object_repository_1 = require("./object-repository")
+const { proto } = require("../../WAProto")
+const { DEFAULT_CONNECTION_CONFIG } = require("../Defaults/connection")
+const { LabelAssociationType } = require("../Types/LabelAssociation")
+const {
+  md5, 
+  toNumber, 
+  updateMessageWithReceipt, 
+  updateMessageWithReaction
+} = require("../Utils")
+const {
+  jidDecode, 
+  jidNormalizedUser
+} = require("../WABinary")
+const { makeOrderedDictionary } = require("./make-ordered-dictionary")
+const { ObjectRepository } = require("./object-repository")
 
 const waChatKey = (pin) => ({
     key: (c) => (pin ? (c.pinned ? '1' : '0') : '') + (c.archived ? '0' : '1') + (c.conversationTimestamp ? c.conversationTimestamp.toString(16).padStart(8, '0') : '') + c.id,
@@ -22,17 +26,17 @@ const waChatKey = (pin) => ({
 const waMessageID = (m) => m.key.id || ''
 
 const waLabelAssociationKey = {
-    key: (la) => (la.type === LabelAssociation_1.LabelAssociationType.Chat ? la.chatId + la.labelId : la.chatId + la.messageId + la.labelId),
+    key: (la) => (la.type === LabelAssociationType.Chat ? la.chatId + la.labelId : la.chatId + la.messageId + la.labelId),
     compare: (k1, k2) => k2.localeCompare(k1)
 }
 
-const makeMessagesDictionary = () => Store_1.makeOrderedDictionary(waMessageID)
+const makeMessagesDictionary = () => makeOrderedDictionary(waMessageID)
 
 const makeInMemoryStore = (config) => {
     const socket = config.socket
     const chatKey = config.chatKey || waChatKey(true)
     const labelAssociationKey = config.labelAssociationKey || waLabelAssociationKey
-    const logger = config.logger || Defaults_1.DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
+    const logger = config.logger || DEFAULT_CONNECTION_CONFIG.logger.child({ stream: 'in-mem-store' })
     const KeyedDB = require('@adiwajshing/keyed-db').default
     const chats = new KeyedDB(chatKey, c => c.id)
     const messages = {}
@@ -40,7 +44,7 @@ const makeInMemoryStore = (config) => {
     const groupMetadata = {}
     const presences = {}
     const state = { connection: 'close' }
-    const labels = new object_repository_1.ObjectRepository()
+    const labels = new ObjectRepository()
     const labelAssociations = new KeyedDB(labelAssociationKey, labelAssociationKey.key)
     const assertMessageList = (jid) => {
         if (!messages[jid]) {
@@ -72,7 +76,7 @@ const makeInMemoryStore = (config) => {
             Object.assign(state, update)
         })
         ev.on('messaging-history.set', ({ chats: newChats, contacts: newContacts, messages: newMessages, isLatest, syncType }) => {
-            if (syncType === WAProto_1.proto.HistorySync.HistorySyncType.ON_DEMAND) {
+            if (syncType === proto.HistorySync.HistorySyncType.ON_DEMAND) {
                 return // FOR NOW,
                 //TODO: HANDLE
             }
@@ -109,8 +113,8 @@ const makeInMemoryStore = (config) => {
                 }
                 else {
                     const contactHashes = await Promise.all(Object.keys(contacts).map(async (contactId) => {
-                        const { user } = WABinary_1.jidDecode(contactId)
-                        return [contactId, (await Utils_1.md5(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)]
+                        const { user } = jidDecode(contactId)
+                        return [contactId, (await md5(Buffer.from(user + 'WA_ADD_NOTIF', 'utf8'))).toString('base64').slice(0, 3)]
                     }))
                     contact = contacts[contactHashes.find(([, b]) => b === update.id?.[0]) || ''] // find contact by attrs.hash, when user is not saved as a contact
                 }
@@ -183,14 +187,14 @@ const makeInMemoryStore = (config) => {
                 case 'append':
                 case 'notify':
                     for (const msg of newMessages) {
-                        const jid = WABinary_1.jidNormalizedUser(msg.key.remoteJid)
+                        const jid = jidNormalizedUser(msg.key.remoteJid)
                         const list = assertMessageList(jid)
                         list.upsert(msg, 'append')
                         if (type === 'notify' && !chats.get(jid)) {
                             ev.emit('chats.upsert', [
                                 {
                                     id: jid,
-                                    conversationTimestamp: Utils_1.toNumber(msg.messageTimestamp),
+                                    conversationTimestamp: toNumber(msg.messageTimestamp),
                                     unreadCount: 1
                                 }
                             ])
@@ -201,7 +205,7 @@ const makeInMemoryStore = (config) => {
         })
         ev.on('messages.update', updates => {
             for (const { update, key } of updates) {
-                const list = assertMessageList(WABinary_1.jidNormalizedUser(key.remoteJid))
+                const list = assertMessageList(jidNormalizedUser(key.remoteJid))
                 if (update?.status) {
                     const listStatus = list.get(key.id)?.status
                     if (listStatus && update?.status <= listStatus) {
@@ -267,7 +271,7 @@ const makeInMemoryStore = (config) => {
                 const obj = messages[key.remoteJid]
                 const msg = obj?.get(key.id)
                 if (msg) {
-                    Utils_1.updateMessageWithReceipt(msg, receipt)
+                    updateMessageWithReceipt(msg, receipt)
                 }
             }
         })
@@ -276,7 +280,7 @@ const makeInMemoryStore = (config) => {
                 const obj = messages[key.remoteJid]
                 const msg = obj?.get(key.id)
                 if (msg) {
-                    Utils_1.updateMessageWithReaction(msg, reaction)
+                    updateMessageWithReaction(msg, reaction)
                 }
             }
         })
@@ -296,7 +300,7 @@ const makeInMemoryStore = (config) => {
         for (const jid in json.messages) {
             const list = assertMessageList(jid)
             for (const msg of json.messages[jid]) {
-                list.upsert(WAProto_1.proto.WebMessageInfo.fromObject(msg), 'append')
+                list.upsert(proto.WebMessageInfo.fromObject(msg), 'append')
             }
         }
     }

package/lib/Types/LabelAssociation.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true })
 
 /** Association type */
 const LabelAssociationType = {
-	Chat: "label_jid", 
-	Message: "label_message"
+  Chat: "label_jid", 
+  Message: "label_message"
 }
 
 module.exports = {

package/lib/Types/Message.js

@@ -2,18 +2,18 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const WAProto_1 = require("../../WAProto")
+const { proto } = require("../../WAProto")
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const WAMessageAddressingMode = {
-	PN: 'pn', 
-	LID: 'lid'
+  PN: 'pn', 
+  LID: 'lid'
 }
 
 module.exports = {
   WAMessageAddressingMode, 
-  WAMessageStubType: WAProto_1.proto.WebMessageInfo.StubType, 
-  WAMessageStatus: WAProto_1.proto.WebMessageInfo.Status, 
-  WAProto: WAProto_1.proto
+  WAMessageStubType: proto.WebMessageInfo.StubType, 
+  WAMessageStatus: proto.WebMessageInfo.Status, 
+  WAProto: proto
 }

package/lib/Types/MexUpdates.js

@@ -3,14 +3,14 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const MexUpdatesOperations = {
-	OWNER_COMMUNITY: "NotificationCommunityOwnerUpdate", 
-	GROUP_MEMBER_LINK: "NotificationGroupMemberLinkPropertyUpdate", 
-	GROUP_LIMIT_SHARING: "NotificationGroupLimitSharingPropertyUpdate"
+  OWNER_COMMUNITY: "NotificationCommunityOwnerUpdate", 
+  GROUP_MEMBER_LINK: "NotificationGroupMemberLinkPropertyUpdate", 
+  GROUP_LIMIT_SHARING: "NotificationGroupLimitSharingPropertyUpdate"
 }
 
 const XWAPathsMexUpdates = {
-	GROUP_SHARING_CHANGE: "xwa2_notify_group_on_prop_change", 
-	COMMUNITY_OWNER_CHANGE: "xwa2_notify_group_on_participants_roles_change"
+  GROUP_SHARING_CHANGE: "xwa2_notify_group_on_prop_change", 
+  COMMUNITY_OWNER_CHANGE: "xwa2_notify_group_on_participants_roles_change"
 }
 
 module.exports = {

package/lib/Types/State.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 
 const SyncState = {
-	Connecting: 0,
-	AwaitingInitialSync: 1, 
-	Syncing: 2,
-	Online: 3
+  Connecting: 0,
+  AwaitingInitialSync: 1, 
+  Syncing: 2,
+  Online: 3
 }
 
 module.exports = {

package/lib/Types/index.js

@@ -1,24 +1,40 @@
 "use strict"
 
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+const __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k
-    var desc = Object.getOwnPropertyDescriptor(m, 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] } }
+      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(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)
+       }
+   }
 }
 
-Object.defineProperty(exports, "__esModule", { value: true })
+Object.defineProperty(exports, "__esModule", { 
+    value: true 
+})
 
-exports.DisconnectReason = void 0
+exports.DisconnectReason = null
 __exportStar(require("./Auth"), exports)
 __exportStar(require("./Bussines"), exports)
 __exportStar(require("./Chat"), exports)

package/lib/Utils/auth-utils.js

@@ -1,18 +1,20 @@
 "use strict"
 
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const crypto_1 = require("crypto")
-const node_cache_1 = __importDefault(require("@cacheable/node-cache"))
-const Defaults_1 = require("../Defaults")
-const LRUCache_1 = require("lru-cache") 
-const crypto_2 = require("./crypto")
-const generics_1 = require("./generics")
-const mutex_1 = require("async-mutex") 
+const { randomBytes } = require("crypto")
+const { default: NodeCache } = require("@cacheable/node-cache")
+const { DEFAULT_CACHE_TTLS } = require("../Defaults/constants")
+const { LRUCache } = require("lru-cache") 
+const { Mutex }= require("async-mutex") 
+const {
+  Curve, 
+  signedKeyPair
+} = require("./crypto")
+const {
+  delay, 
+  generateRegistrationId
+} = require("./generics")
 
 /**
  * Adds caching capability to a SignalKeyStore
@@ -21,14 +23,14 @@ const mutex_1 = require("async-mutex")
  * @param _cache cache store to use
  */
 function makeCacheableSignalKeyStore(store, logger, _cache) {
-    const cache = _cache || new node_cache_1.default({
-        stdTTL: Defaults_1.DEFAULT_CACHE_TTLS.SIGNAL_STORE,
+    const cache = _cache || new NodeCache({
+        stdTTL: DEFAULT_CACHE_TTLS.SIGNAL_STORE,
         useClones: false,
-        deleteOnExpire: true,
+        deleteOnExpire: true
     })
     
     // Mutex for protecting cache operations
-    const cacheMutex = new mutex_1.Mutex()
+    const cacheMutex = new Mutex()
     
     function getUniqueId(type, id) {
         return `${type}.${id}`
@@ -82,8 +84,8 @@ function makeCacheableSignalKeyStore(store, logger, _cache) {
 }
 
 // Module-level specialized mutexes for pre-key operations
-const preKeyMutex = new mutex_1.Mutex()
-const signedPreKeyMutex = new mutex_1.Mutex()
+const preKeyMutex = new Mutex()
+const signedPreKeyMutex = new Mutex()
 
 /**
  * Get the appropriate mutex for the key type
@@ -253,7 +255,7 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
     let mutations = {}
     
     // LRU Cache to hold mutexes for different key types
-    const mutexCache = new LRUCache_1.LRUCache({
+    const mutexCache = new LRUCache({
         ttl: 60 * 60 * 1000, // 1 hour
         ttlAutopurge: true,
         updateAgeOnGet: true
@@ -277,7 +279,7 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
     function getMutex(key) {
         let mutex = mutexCache.get(key)
         if (!mutex) {
-            mutex = new mutex_1.Mutex()
+            mutex = new Mutex()
             mutexCache.set(key, mutex)
             logger.info({ key }, 'created new mutex')
         }
@@ -312,7 +314,7 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
             catch (error) {
                 logger.warn(`failed to commit ${Object.keys(mutations).length} mutations, tries left=${tries}`)
                 if (tries > 0) {
-                    await generics_1.delay(delayBetweenTriesMs)
+                    await delay(delayBetweenTriesMs)
                 }
             }
         }
@@ -494,14 +496,14 @@ const addTransactionCapability = (state, logger, { maxCommitRetries, delayBetwee
 }
 
 const initAuthCreds = () => {
-    const identityKey = crypto_2.Curve.generateKeyPair()
+    const identityKey = Curve.generateKeyPair()
     return {
-        noiseKey: crypto_2.Curve.generateKeyPair(),
-        pairingEphemeralKeyPair: crypto_2.Curve.generateKeyPair(),
+        noiseKey: Curve.generateKeyPair(),
+        pairingEphemeralKeyPair: Curve.generateKeyPair(),
         signedIdentityKey: identityKey,
-        signedPreKey: crypto_2.signedKeyPair(identityKey, 1),
-        registrationId: generics_1.generateRegistrationId(),
-        advSecretKey: crypto_1.randomBytes(32).toString('base64'),
+        signedPreKey: signedKeyPair(identityKey, 1),
+        registrationId: generateRegistrationId(),
+        advSecretKey: randomBytes(32).toString('base64'),
         processedHistoryMessages: [],
         nextPreKeyId: 1,
         firstUnuploadedPreKeyId: 1,

package/lib/Utils/baileys-event-stream.js

@@ -1,70 +1,69 @@
-"use strict"
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
-
-Object.defineProperty(exports, "__esModule", { value: true })
-
-const events_1 = __importDefault(require("events"))
-const fs_1 = require("fs")
-const promises_1 = require("fs/promises")
-const readline_1 = require("readline")
-const generics_1 = require("./generics")
-const make_mutex_1 = require("./make-mutex")
-
-/**
- * Captures events from a baileys event emitter & stores them in a file
- * @param ev The event emitter to read events from
- * @param filename File to save to
- */
-const captureEventStream = (ev, filename) => {
-    const oldEmit = ev.emit
-    // write mutex so data is appended in order
-    const writeMutex = make_mutex_1.makeMutex()
-    // monkey patch eventemitter to capture all events
-    ev.emit = function (...args) {
-        const content = JSON.stringify({ timestamp: Date.now(), event: args[0], data: args[1] }) + '\n'
-        const result = oldEmit.apply(ev, args)
-        writeMutex.mutex(async () => {
-            await promises_1.writeFile(filename, content, { flag: 'a' })
-        })
-        return result
-    }
-}
-
-/**
- * Read event file and emit events from there
- * @param filename filename containing event data
- * @param delayIntervalMs delay between each event emit
- */
-const readAndEmitEventStream = (filename, delayIntervalMs = 0) => {
-    const ev = new events_1.default()
-    const fireEvents = async () => {
-        // from: https://stackoverflow.com/questions/6156501/read-a-file-one-line-at-a-time-in-node-js
-        const fileStream = fs_1.createReadStream(filename)
-        const rl = readline_1.createInterface({
-            input: fileStream,
-            crlfDelay: Infinity
-        })
-        // Note: we use the crlfDelay option to recognize all instances of CR LF
-        // ('\r\n') in input.txt as a single line break.
-        for await (const line of rl) {
-            if (line) {
-                const { event, data } = JSON.parse(line)
-                ev.emit(event, data)
-                delayIntervalMs && await generics_1.delay(delayIntervalMs)
-            }
-        }
-        fileStream.close()
-    }
-    return {
-        ev,
-        task: fireEvents()
-    }
-}
-
-module.exports = {
-  captureEventStream, 
-  readAndEmitEventStream
+"use strict"
+
+Object.defineProperty(exports, "__esModule", { value: true })
+
+const Events = require("events")
+const {
+  promises, 
+  createReadStream 
+} = require("fs")
+const { writeFile } = require("fs/promises")
+const { createInterface } = require("readline")
+const { delay } = require("./generics")
+const { makeMutex } = require("./make-mutex")
+
+/**
+ * Captures events from a baileys event emitter & stores them in a file
+ * @param ev The event emitter to read events from
+ * @param filename File to save to
+ */
+const captureEventStream = (ev, filename) => {
+    const oldEmit = ev.emit
+    // write mutex so data is appended in order
+    const writeMutex = makeMutex()
+    // monkey patch eventemitter to capture all events
+    ev.emit = function (...args) {
+        const content = JSON.stringify({ timestamp: Date.now(), event: args[0], data: args[1] }) + '\n'
+        const result = oldEmit.apply(ev, args)
+        writeMutex.mutex(async () => {
+            await promises.writeFile(filename, content, { flag: 'a' })
+        })
+        return result
+    }
+}
+
+/**
+ * Read event file and emit events from there
+ * @param filename filename containing event data
+ * @param delayIntervalMs delay between each event emit
+ */
+const readAndEmitEventStream = (filename, delayIntervalMs = 0) => {
+    const ev = new Events()
+    const fireEvents = async () => {
+        // from: https://stackoverflow.com/questions/6156501/read-a-file-one-line-at-a-time-in-node-js
+        const fileStream = createReadStream(filename)
+        const rl = createInterface({
+            input: fileStream,
+            crlfDelay: Infinity
+        })
+        // Note: we use the crlfDelay option to recognize all instances of CR LF
+        // ('\r\n') in input.txt as a single line break.
+        for await (const line of rl) {
+            if (line) {
+                const { event, data } = JSON.parse(line)
+                ev.emit(event, data)
+                delayIntervalMs && await delay(delayIntervalMs)
+            }
+        }
+        fileStream.close()
+    }
+    return {
+        ev,
+        task: fireEvents()
+    }
+}
+
+module.exports = {
+  captureEventStream, 
+  readAndEmitEventStream
 }