xmd-baileys 1.0.21 → 1.0.23

package/lib/Defaults/index.js

@@ -82,8 +82,8 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     emitOwnEvents: !0,
     defaultQueryTimeoutMs: 6E4,
     customUploadHosts: [],
-    retryRequestDelayMs: 250,
-    maxMsgRetryCount: 5,
+    retryRequestDelayMs: 50,
+    maxMsgRetryCount: 2,
     fireInitQueries: !0,
     auth: void 0,
     markOnlineOnConnect: !0,
@@ -92,8 +92,10 @@ exports.DEFAULT_CONNECTION_CONFIG = {
     shouldSyncHistoryMessage: () => !0,
     shouldIgnoreJid: () => !1,
     linkPreviewImageThumbnailWidth: 192,
-    transactionOpts: { maxCommitRetries: 10, delayBetweenTriesMs: 3000 },
+    transactionOpts: { maxCommitRetries: 3, delayBetweenTriesMs: 500 },
     generateHighQualityLinkPreview: !1,
+    enableAutoSessionRecreation: !0,
+    enableRecentMessageCache: !0,
     options: {},
     appStateMacVerification: { patch: !1, snapshot: !1 },
     countryCode: "US",

package/lib/Utils/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./lt-hash"), exports);
 __exportStar(require("./auth-utils"), exports);
 __exportStar(require("./baileys-event-stream"), exports);
 __exportStar(require("./use-multi-file-auth-state"), exports);
+__exportStar(require("./message-retry-manager"), exports);
 __exportStar(require("./link-preview"), exports);
 __exportStar(require("./event-buffer"), exports);
 __exportStar(require("./process-message"), exports);

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

@@ -0,0 +1,126 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageRetryManager = void 0;
+const NodeCache = require("node-cache");
+const RECENT_MESSAGES_SIZE = 512;
+const MESSAGE_KEY_SEPARATOR = '\u0000';
+const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000;
+const PHONE_REQUEST_DELAY = 3000;
+class MessageRetryManager {
+    constructor(logger, maxMsgRetryCount) {
+        this.logger = logger;
+        this.recentMessagesMap = new NodeCache({
+            maxKeys: RECENT_MESSAGES_SIZE,
+            stdTTL: 5 * 60,
+            useClones: false
+        });
+        this.messageKeyIndex = new Map();
+        this.sessionRecreateHistory = new NodeCache({
+            stdTTL: RECREATE_SESSION_TIMEOUT * 2 / 1000,
+            useClones: false
+        });
+        this.retryCounters = new NodeCache({
+            stdTTL: 15 * 60,
+            useClones: false
+        });
+        this.pendingPhoneRequests = {};
+        this.maxMsgRetryCount = maxMsgRetryCount || 5;
+        this.statistics = {
+            totalRetries: 0,
+            successfulRetries: 0,
+            failedRetries: 0,
+            mediaRetries: 0,
+            sessionRecreations: 0,
+            phoneRequests: 0
+        };
+    }
+    addRecentMessage(to, id, message) {
+        const key = { to, id };
+        const keyStr = this.keyToString(key);
+        this.recentMessagesMap.set(keyStr, {
+            message,
+            timestamp: Date.now()
+        });
+        this.messageKeyIndex.set(id, keyStr);
+    }
+    getRecentMessage(to, id) {
+        const key = { to, id };
+        const keyStr = this.keyToString(key);
+        return this.recentMessagesMap.get(keyStr);
+    }
+    shouldRecreateSession(jid, retryCount, hasSession) {
+        if (!hasSession) {
+            this.sessionRecreateHistory.set(jid, Date.now());
+            this.statistics.sessionRecreations++;
+            return {
+                reason: "we don't have a Signal session with them",
+                recreate: true
+            };
+        }
+        if (retryCount < 2) {
+            return { reason: '', recreate: false };
+        }
+        const now = Date.now();
+        const prevTime = this.sessionRecreateHistory.get(jid);
+        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
+            };
+        }
+        return { reason: '', recreate: false };
+    }
+    incrementRetryCount(messageId) {
+        const current = this.retryCounters.get(messageId) || 0;
+        this.retryCounters.set(messageId, current + 1);
+        this.statistics.totalRetries++;
+        return current + 1;
+    }
+    getRetryCount(messageId) {
+        return this.retryCounters.get(messageId) || 0;
+    }
+    hasExceededMaxRetries(messageId) {
+        return this.getRetryCount(messageId) >= this.maxMsgRetryCount;
+    }
+    markRetrySuccess(messageId) {
+        this.statistics.successfulRetries++;
+        this.retryCounters.del(messageId);
+        this.cancelPendingPhoneRequest(messageId);
+        this.removeRecentMessage(messageId);
+    }
+    markRetryFailed(messageId) {
+        this.statistics.failedRetries++;
+        this.retryCounters.del(messageId);
+        this.cancelPendingPhoneRequest(messageId);
+        this.removeRecentMessage(messageId);
+    }
+    schedulePhoneRequest(messageId, callback, delay = PHONE_REQUEST_DELAY) {
+        this.cancelPendingPhoneRequest(messageId);
+        this.pendingPhoneRequests[messageId] = setTimeout(() => {
+            delete this.pendingPhoneRequests[messageId];
+            this.statistics.phoneRequests++;
+            callback();
+        }, delay);
+    }
+    cancelPendingPhoneRequest(messageId) {
+        const timeout = this.pendingPhoneRequests[messageId];
+        if (timeout) {
+            clearTimeout(timeout);
+            delete this.pendingPhoneRequests[messageId];
+        }
+    }
+    keyToString(key) {
+        return `${key.to}${MESSAGE_KEY_SEPARATOR}${key.id}`;
+    }
+    removeRecentMessage(messageId) {
+        const keyStr = this.messageKeyIndex.get(messageId);
+        if (!keyStr) {
+            return;
+        }
+        this.recentMessagesMap.del(keyStr);
+        this.messageKeyIndex.delete(messageId);
+    }
+}
+exports.MessageRetryManager = MessageRetryManager;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xmd-baileys",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "description": "A lightweight, full-featured WhatsApp Web API library for Node.js",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",