@hansaka02/baileys 7.3.2 → 7.3.6

package/lib/Utils/link-preview.js

@@ -1,41 +1,19 @@
 "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 (mod) {
-    if (mod && mod.__esModule) return mod
-    var result = {}
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k)
-    __setModuleDefault(result, mod)
-    return result
-}
-
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const messages_1 = require("./messages")
-const messages_media_1 = require("./messages-media")
+const { unfurl } = require('unfurl.js')
+const { prepareWAMessageMedia } = require("./messages")
+const {
+  getHttpStream, 
+  extractImageThumb
+} = require("./messages-media")
 const THUMBNAIL_WIDTH_PX = 192
 
 /** Fetches an image and generates a thumbnail for it */
 const getCompressedJpegThumbnail = async (url, { thumbnailWidth, fetchOpts }) => {
-    const stream = await messages_media_1.getHttpStream(url, fetchOpts)
-    const result = await messages_media_1.extractImageThumb(stream, thumbnailWidth)
+    const stream = await getHttpStream(url, fetchOpts)
+    const result = await extractImageThumb(stream, thumbnailWidth)
     return result
 }
 
@@ -45,38 +23,24 @@ const getCompressedJpegThumbnail = async (url, { thumbnailWidth, fetchOpts }) =>
  * @param text first matched URL in text
  * @returns the URL info required to generate link preview
  */
-const getUrlInfo = async (text, opts = { thumbnailWidth: THUMBNAIL_WIDTH_PX, fetchOpts: { timeout: 3000 }}) => {
+const getUrlInfo = async (text, opts = { thumbnailWidth: THUMBNAIL_WIDTH_PX, fetchOpts: { timeout: 3000 } }) => {
     try {
-        const retries = 0
-        const maxRetry = 5
-        const { getLinkPreview } = await Promise.resolve().then(() => __importStar(require('link-preview-js')))
         let previewLink = text
+        
         if (!text.startsWith('https://') && !text.startsWith('http://')) {
             previewLink = 'https://' + previewLink
         }
-        const info = await getLinkPreview(previewLink, {
+        
+        const { open_graph: info } = await unfurl(previewLink, {
             ...opts.fetchOpts,
-            followRedirects: 'follow',
-            handleRedirects: (baseURL, forwardedURL) => {
-                const urlObj = new URL(baseURL)
-                const forwardedURLObj = new URL(forwardedURL)
-                if (retries >= maxRetry) {
-                    return false
-                }
-                if (forwardedURLObj.hostname === urlObj.hostname
-                    || forwardedURLObj.hostname === 'www.' + urlObj.hostname
-                    || 'www.' + forwardedURLObj.hostname === urlObj.hostname) {
-                    retries + 1
-                    return true
-                }
-                else {
-                    return false
-                }
-            },
-            headers: opts.fetchOpts
-        })
+            oembed: false, 
+            compress: true, 
+            size: 0,
+            follow: 50
+        }) 
+        
         if (info && 'title' in info && info.title) {
-            const [image] = info.images
+            const image = info.images?.[0]?.url
             const urlInfo = {
                 'canonical-url': info.url,
                 'matched-text': text,
@@ -84,22 +48,20 @@ const getUrlInfo = async (text, opts = { thumbnailWidth: THUMBNAIL_WIDTH_PX, fet
                 description: info.description,
                 originalThumbnailUrl: image
             }
+            
             if (opts.uploadImage) {
-                const { imageMessage } = await messages_1.prepareWAMessageMedia({ image: { url: image } }, {
+                const { imageMessage } = await prepareWAMessageMedia({ image: { url: image } }, {
                     upload: opts.uploadImage,
                     mediaTypeOverride: 'thumbnail-link',
                     options: opts.fetchOpts
                 })
-                urlInfo.jpegThumbnail = imageMessage?.jpegThumbnail
-                    ? Buffer.from(imageMessage.jpegThumbnail)
-                    : undefined
+                
+                urlInfo.jpegThumbnail = imageMessage?.jpegThumbnail ? Buffer.from(imageMessage.jpegThumbnail) : undefined
                 urlInfo.highQualityThumbnail = imageMessage || undefined
             }
             else {
                 try {
-                    urlInfo.jpegThumbnail = image
-                        ? (await getCompressedJpegThumbnail(image, opts)).buffer
-                        : undefined
+                    urlInfo.jpegThumbnail = image ? (await getCompressedJpegThumbnail(image, opts)).buffer : undefined
                 }
                 catch (error) {
                     opts.logger?.debug({ err: error.stack, url: previewLink }, 'error in generating thumbnail')

package/lib/Utils/logger.js

@@ -1,7 +1,7 @@
 "use strict"
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod }
-}
+
 Object.defineProperty(exports, "__esModule", { value: true })
-const pino_1 = __importDefault(require("pino"))
-exports.default = pino_1.default({ timestamp: () => `,"time":"${new Date().toJSON()}"` })
+
+const pino = require("pino")
+
+exports.default = pino({ timestamp: () => `,"time":"${new Date().toJSON()}"` })

package/lib/Utils/lt-hash.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const crypto_1 = require("./crypto")
+const { hkdf } = require("./crypto")
 
 /**
  * LT Hash is a summation based hash algorithm that maintains the integrity of a piece of data
@@ -10,48 +10,54 @@ const crypto_1 = require("./crypto")
  * if the same series of mutations was made sequentially.
  */
 const o = 128
-class d {
+
+class LTHash {
     constructor(e) {
         this.salt = e
     }
-    add(e, t) {
-        var r = this
+    
+    async add(e, t) {
         for (const item of t) {
-            e = r._addSingle(e, item)
+            e = await this._addSingle(e, item)
         }
         return e
     }
-    subtract(e, t) {
-        var r = this
+    
+    async subtract(e, t) {
         for (const item of t) {
-            e = r._subtractSingle(e, item)
+            e = await this._subtractSingle(e, item)
         }
         return e
     }
-    subtractThenAdd(e, t, r) {
-        var n = this
-        return n.add(n.subtract(e, r), t)
+    
+    async subtractThenAdd(e, addList, subtractList) {
+        const subtracted = await this.subtract(e, subtractList)
+        return this.add(subtracted, addList)
     }
+    
     async _addSingle(e, t) {
-        var r = this
-        const n = new Uint8Array(await crypto_1.hkdf(Buffer.from(t), o, { info: r.salt })).buffer
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e + t))
+        const derived = new Uint8Array(await hkdf(Buffer.from(t), o, { info: this.salt })).buffer
+        return this.performPointwiseWithOverflow(e, derived, (a, b) => a + b)
     }
+    
     async _subtractSingle(e, t) {
-        var r = this
-        const n = new Uint8Array(await crypto_1.hkdf(Buffer.from(t), o, { info: r.salt })).buffer
-        return r.performPointwiseWithOverflow(await e, n, ((e, t) => e - t))
+        const derived = new Uint8Array(await hkdf(Buffer.from(t), o, { info: this.salt })).buffer
+        return this.performPointwiseWithOverflow(e, derived, (a, b) => a - b)
     }
-    performPointwiseWithOverflow(e, t, r) {
-        const n = new DataView(e), i = new DataView(t), a = new ArrayBuffer(n.byteLength), s = new DataView(a)
-        for (let e = 0; e < n.byteLength; e += 2) {
-            s.setUint16(e, r(n.getUint16(e, !0), i.getUint16(e, !0)), !0)
+    
+    performPointwiseWithOverflow(e, t, op) {
+        const n = new DataView(e)
+        const i = new DataView(t)
+        const out = new ArrayBuffer(n.byteLength)
+        const s = new DataView(out)
+        for (let offset = 0; offset < n.byteLength; offset += 2) {
+            s.setUint16(offset, op(n.getUint16(offset, true), i.getUint16(offset, true)), true)
         }
-        return a
+        return out
     }
 }
 
-const LT_HASH_ANTI_TAMPERING = new d('WhatsApp Patch Integrity')
+const LT_HASH_ANTI_TAMPERING = new LTHash('WhatsApp Patch Integrity')
 
 module.exports = {
   LT_HASH_ANTI_TAMPERING

package/lib/Utils/make-mutex.js

@@ -2,43 +2,41 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
+const { Mutex: AsyncMutex } = require("async-mutex")
+
 const makeMutex = () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let task = Promise.resolve()
-    let taskTimeout
+    const mutex = new AsyncMutex()
     return {
         mutex(code) {
-            task = (async () => {
-                // wait for the previous task to complete
-                // if there is an error, we swallow so as to not block the queue
-                try {
-                    await task
-                }
-                catch (_a) { }
-                try {
-                    // execute the current task
-                    const result = await code()
-                    return result
-                }
-                finally {
-                    clearTimeout(taskTimeout)
-                }
-            })()
-            // we replace the existing task, appending the new piece of execution to it
-            // so the next task will have to wait for this one to finish
-            return task
-        },
+            return mutex.runExclusive(code)
+        }
     }
 }
 
 const makeKeyedMutex = () => {
-    const map = {}
+    const map = new Map()
     return {
-        mutex(key, task) {
-            if (!map[key]) {
-                map[key] = makeMutex()
+        async mutex(key, task) {
+            let entry = map.get(key)
+            
+            if (!entry) {
+                entry = { mutex: new AsyncMutex(), refCount: 0 }
+                map.set(key, entry)
+            }
+            
+            entry.refCount++
+            
+            try {
+                return await entry.mutex.runExclusive(task)
+            }
+            finally {
+                entry.refCount--
+                
+                // only delete it if this is still the current entry
+                if (entry.refCount === 0 && map.get(key) === entry) {
+                    map.delete(key)
+                }
             }
-            return map[key].mutex(task)
         }
     }
 }

package/lib/Utils/message-retry-manager.js

@@ -2,11 +2,13 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const LRUCache_1 = require("lru-cache")
+const { LRUCache } = require("lru-cache")
 
 /** Number of sent messages to cache in memory for handling retry receipts */
 const RECENT_MESSAGES_SIZE = 512
 
+const MESSAGE_KEY_SEPARATOR = '\u0000'
+
 /** Timeout for session recreation - 1 hour */
 const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000 // 1 hour in milliseconds
 
@@ -15,14 +17,24 @@ const PHONE_REQUEST_DELAY = 3000
 class MessageRetryManager {
     constructor(logger, maxMsgRetryCount) {
         this.logger = logger
-        this.recentMessagesMap = new LRUCache_1.LRUCache({
-            max: RECENT_MESSAGES_SIZE
+        this.recentMessagesMap = new LRUCache({
+            max: RECENT_MESSAGES_SIZE,
+            ttl: 5 * 60 * 1000,
+            ttlAutopurge: true,
+            dispose: (_value, key) => {
+                const separatorIndex = key.lastIndexOf(MESSAGE_KEY_SEPARATOR)
+                if (separatorIndex > -1) {
+                    const messageId = key.slice(separatorIndex + MESSAGE_KEY_SEPARATOR.length)
+                    this.messageKeyIndex.delete(messageId)
+                }
+            }
         })
-        this.sessionRecreateHistory = new LRUCache_1.LRUCache({
+        this.messageKeyIndex = new Map()
+        this.sessionRecreateHistory = new LRUCache({
             ttl: RECREATE_SESSION_TIMEOUT * 2,
             ttlAutopurge: true
         })
-        this.retryCounters = new LRUCache_1.LRUCache({
+        this.retryCounters = new LRUCache({
             ttl: 15 * 60 * 1000,
             ttlAutopurge: true,
             updateAgeOnGet: true
@@ -39,27 +51,33 @@ class MessageRetryManager {
         }
         this.maxMsgRetryCount = maxMsgRetryCount
     }
+    
     /**
      * Add a recent message to the cache for retry handling
      */
     addRecentMessage(to, id, message) {
         const key = { to, id }
         const keyStr = this.keyToString(key)
+        
         // Add new message
         this.recentMessagesMap.set(keyStr, {
             message,
             timestamp: Date.now()
         })
+        this.messageKeyIndex.set(id, keyStr)
         this.logger.debug(`Added message to retry cache: ${to}/${id}`)
     }
+    
     /**
      * Get a recent message from the cache
      */
     getRecentMessage(to, id) {
         const key = { to, id }
         const keyStr = this.keyToString(key)
+        
         return this.recentMessagesMap.get(keyStr)
     }
+    
     /**
      * Check if a session should be recreated based on retry count and history
      */
@@ -73,16 +91,20 @@ class MessageRetryManager {
                 recreate: true
             }
         }
+        
         // Only consider recreation if retry count > 1
         if (retryCount < 2) {
             return { reason: '', recreate: false }
         }
+        
         const now = Date.now()
         const prevTime = this.sessionRecreateHistory.get(jid)
+        
         // If no previous recreation or it's been more than an hour
         if (!prevTime || now - prevTime > RECREATE_SESSION_TIMEOUT) {
             this.sessionRecreateHistory.set(jid, now)
             this.statistics.sessionRecreations++
+            
             return {
                 reason: 'retry count > 1 and over an hour since last recreation',
                 recreate: true
@@ -90,26 +112,31 @@ class MessageRetryManager {
         }
         return { reason: '', recreate: false }
     }
+    
     /**
      * Increment retry counter for a message
      */
     incrementRetryCount(messageId) {
         this.retryCounters.set(messageId, (this.retryCounters.get(messageId) || 0) + 1)
         this.statistics.totalRetries++
+        
         return this.retryCounters.get(messageId)
     }
+    
     /**
      * Get retry count for a message
      */
     getRetryCount(messageId) {
         return this.retryCounters.get(messageId) || 0
     }
+    
     /**
      * Check if message has exceeded maximum retry attempts
      */
     hasExceededMaxRetries(messageId) {
         return this.getRetryCount(messageId) >= this.maxMsgRetryCount
     }
+    
     /**
      * Mark retry as successful
      */
@@ -118,14 +145,19 @@ class MessageRetryManager {
         // Clean up retry counter for successful message
         this.retryCounters.delete(messageId)
         this.cancelPendingPhoneRequest(messageId)
+        this.removeRecentMessage(messageId)
     }
+    
     /**
      * Mark retry as failed
      */
     markRetryFailed(messageId) {
         this.statistics.failedRetries++
         this.retryCounters.delete(messageId)
+        this.cancelPendingPhoneRequest(messageId)
+        this.removeRecentMessage(messageId)
     }
+    
     /**
      * Schedule a phone request with delay
      */
@@ -134,24 +166,40 @@ class MessageRetryManager {
         this.cancelPendingPhoneRequest(messageId)
         this.pendingPhoneRequests[messageId] = setTimeout(() => {
             delete this.pendingPhoneRequests[messageId]
+            
             this.statistics.phoneRequests++
+            
             callback()
         }, delay)
-        this.logger.debug(`Scheduled phone request for message ${messageId} with ${delay}ms delay`)
+        this.logger.debug(`Scheduled phone request for message ${messageId} with ${delay}ms delay`);
     }
+    
     /**
      * Cancel pending phone request
      */
     cancelPendingPhoneRequest(messageId) {
         const timeout = this.pendingPhoneRequests[messageId]
+        
         if (timeout) {
             clearTimeout(timeout)
+            
             delete this.pendingPhoneRequests[messageId]
+            
             this.logger.debug(`Cancelled pending phone request for message ${messageId}`)
         }
     }
+    
     keyToString(key) {
-        return `${key.to}:${key.id}`
+        return `${key.to}${MESSAGE_KEY_SEPARATOR}${key.id}`
+    }
+    
+    removeRecentMessage(messageId) {
+        const keyStr = this.messageKeyIndex.get(messageId)
+        
+        if (!keyStr) return
+        
+        this.recentMessagesMap.delete(keyStr)
+        this.messageKeyIndex.delete(messageId)
     }
 }