@ubedsockets/baileys 1.6.9 → 1.7.0

package/lib/Utils/generics.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.generateMessageID = exports.generateMessageIDV2 = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeNewsletterMessage = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.getPlatformId = exports.Browsers = void 0;
+exports.isWABusinessPlatform = exports.getCodeFromWSError = exports.getCallStatusFromNode = exports.getErrorCodeFromStreamError = exports.getStatusFromReceiptType = exports.generateMdTagPrefix = exports.fetchLatestWaWebVersion = exports.fetchLatestelainaVersion = exports.fetchLatestBaileysVersion = exports.printQRIfNecessaryListener = exports.bindWaitForConnectionUpdate = exports.generateMessageID = exports.generateMessageIDV2 = exports.delayCancellable = exports.delay = exports.debouncedTimeout = exports.unixTimestampSeconds = exports.toNumber = exports.encodeBigEndian = exports.generateRegistrationId = exports.encodeNewsletterMessage = exports.encodeWAMessage = exports.unpadRandomMax16 = exports.writeRandomPadMax16 = exports.getKeyAuthor = exports.BufferJSON = exports.getPlatformId = exports.Browsers = void 0;
 exports.promiseTimeout = promiseTimeout;
 exports.bindWaitForEvent = bindWaitForEvent;
 exports.trimUndefined = trimUndefined;
@@ -46,7 +46,7 @@ const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
 const os_1 = require("os");
 const WAProto_1 = require("../../WAProto");
-const baileys_version_json_1 = require("../Defaults/baileys-version.json");
+const elaina_version_json_1 = require("../Defaults/elaina-version.json");
 const Types_1 = require("../Types");
 const WABinary_1 = require("../WABinary");
 const COMPANION_PLATFORM_MAP = {
@@ -258,27 +258,51 @@ const printQRIfNecessaryListener = (ev, logger) => {
     });
 };
 exports.printQRIfNecessaryListener = printQRIfNecessaryListener;
-const fetchLatestBaileysVersion = async (options = {}) => {
-    const URL = 'https://raw.githubusercontent.com/WhiskeySockets/Baileys/master/src/Defaults/baileys-version.json';
+
+const fetchLatestelainaVersion = async (options = {}) => {
     try {
-        const result = await axios_1.default.get(URL, {
+        const { data } = await axios_1.default.get('https://registry.npmjs.org/elaina', {
             ...options,
             responseType: 'json'
         });
+        const versionStr = data.version;  
+        const [major, minor, patch] = versionStr.split('.').map(Number);
         return {
-            version: result.data.version,
+            version: [major, minor, patch],
             isLatest: true
         };
+    } catch (error) {
+        return {
+            version: elaina_version_json_1.version,  
+            isLatest: false,
+            error
+        };
     }
-    catch (error) {
+};
+exports.fetchLatestelainaVersion = fetchLatestelainaVersion;
+
+const fetchLatestBaileysVersion = async (options = {}) => {
+    try {
+        const { data } = await axios_1.default.get('https://registry.npmjs.org/elaina', {
+            ...options,
+            responseType: 'json'
+        });
+        const versionStr = data.version; 
+        const [major, minor, patch] = versionStr.split('.').map(Number);
+        return {
+            version: [major, minor, patch],
+            isLatest: true
+        };
+    } catch (error) {
         return {
-            version: baileys_version_json_1.version,
+            version: elaina_version_json_1.version,  
             isLatest: false,
             error
         };
     }
 };
 exports.fetchLatestBaileysVersion = fetchLatestBaileysVersion;
+
 /**
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
@@ -293,7 +317,7 @@ const fetchLatestWaWebVersion = async (options) => {
         const match = data.match(regex);
         if (!(match === null || match === void 0 ? void 0 : match[1])) {
             return {
-                version: baileys_version_json_1.version,
+                version: elaina_version_json_1.version,
                 isLatest: false,
                 error: {
                     message: 'Could not find client revision in the fetched content'
@@ -308,7 +332,7 @@ const fetchLatestWaWebVersion = async (options) => {
     }
     catch (error) {
         return {
-            version: baileys_version_json_1.version,
+            version: elaina_version_json_1.version,
             isLatest: false,
             error
         };
@@ -439,3 +463,5 @@ function bytesToCrockford(buffer) {
     }
     return crockford.join('');
 }
+exports.trimUndefined = trimUndefined;
+exports.bytesToCrockford = bytesToCrockford;

package/lib/Utils/index.js

@@ -26,8 +26,10 @@ __exportStar(require("./history"), exports);
 __exportStar(require("./chat-utils"), exports);
 __exportStar(require("./lt-hash"), exports);
 __exportStar(require("./auth-utils"), exports);
-__exportStar(require("./baileys-event-stream"), exports);
+__exportStar(require("./elaina-event-stream"), exports);
 __exportStar(require("./use-multi-file-auth-state"), exports);
 __exportStar(require("./link-preview"), exports);
 __exportStar(require("./event-buffer"), exports);
 __exportStar(require("./process-message"), exports);
+__exportStar(require("./message-retry-manager"), exports);
+__exportStar(require("./browser-utils"), exports);

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

@@ -1,64 +1,32 @@
-import { LRUCache } from 'lru-cache';
-/** Number of sent messages to cache in memory for handling retry receipts */
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageRetryManager = void 0;
+
+const lru_cache_1 = require("lru-cache");
+
 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
+
+const RECREATE_SESSION_TIMEOUT = 60 * 60 * 1000;
+
 const PHONE_REQUEST_DELAY = 3000;
-// Retry reason codes matching WhatsApp Web's Signal error codes.
-export var RetryReason;
-(function (RetryReason) {
-    RetryReason[RetryReason["UnknownError"] = 0] = "UnknownError";
-    RetryReason[RetryReason["SignalErrorNoSession"] = 1] = "SignalErrorNoSession";
-    RetryReason[RetryReason["SignalErrorInvalidKey"] = 2] = "SignalErrorInvalidKey";
-    RetryReason[RetryReason["SignalErrorInvalidKeyId"] = 3] = "SignalErrorInvalidKeyId";
-    /** MAC verification failed - most common cause of decryption failures */
-    RetryReason[RetryReason["SignalErrorInvalidMessage"] = 4] = "SignalErrorInvalidMessage";
-    RetryReason[RetryReason["SignalErrorInvalidSignature"] = 5] = "SignalErrorInvalidSignature";
-    RetryReason[RetryReason["SignalErrorFutureMessage"] = 6] = "SignalErrorFutureMessage";
-    /** Explicit MAC failure - session is definitely out of sync */
-    RetryReason[RetryReason["SignalErrorBadMac"] = 7] = "SignalErrorBadMac";
-    RetryReason[RetryReason["SignalErrorInvalidSession"] = 8] = "SignalErrorInvalidSession";
-    RetryReason[RetryReason["SignalErrorInvalidMsgKey"] = 9] = "SignalErrorInvalidMsgKey";
-    RetryReason[RetryReason["BadBroadcastEphemeralSetting"] = 10] = "BadBroadcastEphemeralSetting";
-    RetryReason[RetryReason["UnknownCompanionNoPrekey"] = 11] = "UnknownCompanionNoPrekey";
-    RetryReason[RetryReason["AdvFailure"] = 12] = "AdvFailure";
-    RetryReason[RetryReason["StatusRevokeDelay"] = 13] = "StatusRevokeDelay";
-})(RetryReason || (RetryReason = {}));
-/** Error codes that indicate a MAC failure and require immediate session recreation */
-const MAC_ERROR_CODES = new Set([RetryReason.SignalErrorInvalidMessage, RetryReason.SignalErrorBadMac]);
-export class MessageRetryManager {
+
+class MessageRetryManager {
     constructor(logger, maxMsgRetryCount) {
         this.logger = logger;
-        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.maxMsgRetryCount = maxMsgRetryCount;
+        this._recentMessagesMap = new lru_cache_1.LRUCache({
+            max: RECENT_MESSAGES_SIZE
         });
-        this.messageKeyIndex = new Map();
-        this.sessionRecreateHistory = new LRUCache({
+        this._sessionRecreateHistory = new lru_cache_1.LRUCache({
             ttl: RECREATE_SESSION_TIMEOUT * 2,
             ttlAutopurge: true
         });
-        this.retryCounters = new LRUCache({
+        this._retryCounters = new lru_cache_1.LRUCache({
             ttl: 15 * 60 * 1000,
             ttlAutopurge: true,
             updateAgeOnGet: true
-        }); // 15 minutes TTL
-        this.baseKeys = new LRUCache({
-            max: 1024,
-            ttl: 15 * 60 * 1000,
-            ttlAutopurge: true
         });
-        this.pendingPhoneRequests = {};
-        this.maxMsgRetryCount = 5;
+        this._pendingPhoneRequests = {};
         this.statistics = {
             totalRetries: 0,
             successfulRetries: 0,
@@ -69,57 +37,36 @@ export 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, {
+        const keyStr = this._keyToString(key);
+        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);
+        const keyStr = this._keyToString(key);
+        return this._recentMessagesMap.get(keyStr);
     }
-    /**
-     * Check if a session should be recreated based on retry count, history, and error code.
-     * MAC errors (codes 4 and 7) trigger immediate session recreation regardless of timeout.
-     */
-    shouldRecreateSession(jid, hasSession, errorCode) {
-        // If we don't have a session, always recreate
+    shouldRecreateSession(jid, retryCount, hasSession) {
         if (!hasSession) {
-            this.sessionRecreateHistory.set(jid, Date.now());
+            this._sessionRecreateHistory.set(jid, Date.now());
             this.statistics.sessionRecreations++;
             return {
                 reason: "we don't have a Signal session with them",
                 recreate: true
             };
         }
-        // IMMEDIATE recreation for MAC errors - session is definitely out of sync
-        if (errorCode !== undefined && MAC_ERROR_CODES.has(errorCode)) {
-            this.sessionRecreateHistory.set(jid, Date.now());
-            this.statistics.sessionRecreations++;
-            this.logger.warn({ jid, errorCode: RetryReason[errorCode] }, 'MAC error detected, forcing immediate session recreation');
-            return {
-                reason: `MAC error (code ${errorCode}: ${RetryReason[errorCode]}), immediate session recreation`,
-                recreate: true
-            };
+        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
+        const prevTime = this._sessionRecreateHistory.get(jid);
         if (!prevTime || now - prevTime > RECREATE_SESSION_TIMEOUT) {
-            this.sessionRecreateHistory.set(jid, now);
+            this._sessionRecreateHistory.set(jid, now);
             this.statistics.sessionRecreations++;
             return {
                 reason: 'retry count > 1 and over an hour since last recreation',
@@ -128,138 +75,54 @@ export class MessageRetryManager {
         }
         return { reason: '', recreate: false };
     }
-    /**
-     * Parse error code from retry receipt's retry node.
-     * Returns undefined if no error code is present.
-     */
-    parseRetryErrorCode(errorAttr) {
-        if (errorAttr === undefined || errorAttr === '') {
-            return undefined;
-        }
-        const code = parseInt(errorAttr, 10);
-        if (Number.isNaN(code)) {
-            return undefined;
-        }
-        // Validate it's a known RetryReason
-        if (code >= RetryReason.UnknownError && code <= RetryReason.StatusRevokeDelay) {
-            return code;
-        }
-        return RetryReason.UnknownError;
-    }
-    /**
-     * Check if an error code indicates a MAC failure
-     */
-    isMacError(errorCode) {
-        return errorCode !== undefined && MAC_ERROR_CODES.has(errorCode);
-    }
-    /**
-     * Increment retry counter for a message
-     */
     incrementRetryCount(messageId) {
-        this.retryCounters.set(messageId, (this.retryCounters.get(messageId) || 0) + 1);
+        this._retryCounters.set(messageId, (this._retryCounters.get(messageId) || 0) + 1);
         this.statistics.totalRetries++;
-        return this.retryCounters.get(messageId);
+        return this._retryCounters.get(messageId);
     }
-    /**
-     * Get retry count for a message
-     */
     getRetryCount(messageId) {
-        return this.retryCounters.get(messageId) || 0;
+        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
-     */
     markRetrySuccess(messageId) {
         this.statistics.successfulRetries++;
-        // Clean up retry counter for successful message
-        this.retryCounters.delete(messageId);
-        this.cancelPendingPhoneRequest(messageId);
-        this.removeRecentMessage(messageId);
+        this._retryCounters.delete(messageId);
+        this._cancelPendingPhoneRequest(messageId);
     }
-    /**
-     * Mark retry as failed
-     */
     markRetryFailed(messageId) {
         this.statistics.failedRetries++;
-        this.retryCounters.delete(messageId);
-        this.cancelPendingPhoneRequest(messageId);
-        this.removeRecentMessage(messageId);
+        this._retryCounters.delete(messageId);
     }
-    /**
-     * Schedule a phone request with delay
-     */
     schedulePhoneRequest(messageId, callback, delay = PHONE_REQUEST_DELAY) {
-        // Cancel any existing request for this message
-        this.cancelPendingPhoneRequest(messageId);
-        this.pendingPhoneRequests[messageId] = setTimeout(() => {
-            delete this.pendingPhoneRequests[messageId];
+        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`);
     }
-    /**
-     * Cancel pending phone request
-     */
     cancelPendingPhoneRequest(messageId) {
-        const timeout = this.pendingPhoneRequests[messageId];
+        const timeout = this._pendingPhoneRequests[messageId];
         if (timeout) {
             clearTimeout(timeout);
-            delete this.pendingPhoneRequests[messageId];
+            delete this._pendingPhoneRequests[messageId];
             this.logger.debug(`Cancelled pending phone request for message ${messageId}`);
         }
     }
-    clear() {
-        this.recentMessagesMap.clear();
-        this.messageKeyIndex.clear();
-        this.sessionRecreateHistory.clear();
-        this.retryCounters.clear();
-        this.baseKeys.clear();
-        for (const messageId of Object.keys(this.pendingPhoneRequests)) {
-            this.cancelPendingPhoneRequest(messageId);
-        }
-        this.statistics = {
-            totalRetries: 0,
-            successfulRetries: 0,
-            failedRetries: 0,
-            mediaRetries: 0,
-            sessionRecreations: 0,
-            phoneRequests: 0
-        };
+    _keyToString(key) {
+        return `${key.to}:${key.id}`;
     }
-    saveBaseKey(addr, msgId, baseKey) {
-        this.baseKeys.set(`${addr}:${msgId}`, baseKey);
-    }
-    hasSameBaseKey(addr, msgId, baseKey) {
-        const stored = this.baseKeys.get(`${addr}:${msgId}`);
-        if (!stored || stored.length !== baseKey.length) {
-            return false;
-        }
-        for (let i = 0; i < stored.length; i++) {
-            if (stored[i] !== baseKey[i])
-                return false;
-        }
-        return true;
-    }
-    deleteBaseKey(addr, msgId) {
-        this.baseKeys.delete(`${addr}:${msgId}`);
-    }
-    keyToString(key) {
-        return `${key.to}${MESSAGE_KEY_SEPARATOR}${key.id}`;
-    }
-    removeRecentMessage(messageId) {
-        const keyStr = this.messageKeyIndex.get(messageId);
-        if (!keyStr) {
-            return;
+    _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}`);
         }
-        this.recentMessagesMap.delete(keyStr);
-        this.messageKeyIndex.delete(messageId);
     }
 }
-//# sourceMappingURL=message-retry-manager.js.map
+
+exports.MessageRetryManager = MessageRetryManager;