@charape/baileys 1.0.8 → 1.0.10

package/lib/index.cjs

@@ -1896,6 +1896,7 @@ __export(index_exports, {
   WEB_EVENTS: () => WEB_EVENTS,
   WEB_GLOBALS: () => WEB_GLOBALS,
   XWAPaths: () => XWAPaths,
+  addBoundedSetEntry: () => addBoundedSetEntry,
   addTransactionCapability: () => addTransactionCapability,
   aesDecrypt: () => aesDecrypt,
   aesDecryptCTR: () => aesDecryptCTR,
@@ -1973,6 +1974,7 @@ __export(index_exports, {
   extractVideoThumb: () => extractVideoThumb,
   fetchLatestBaileysVersion: () => fetchLatestBaileysVersion,
   fetchLatestWaWebVersion: () => fetchLatestWaWebVersion,
+  formatCharapeChatLog: () => formatCharapeChatLog,
   generateAndroMessageID: () => generateAndroMessageID,
   generateCodeBlockContent: () => generateCodeBlockContent,
   generateForwardMessageContent: () => generateForwardMessageContent,
@@ -2083,13 +2085,16 @@ __export(index_exports, {
   prepareDisappearingMessageSettingContent: () => prepareDisappearingMessageSettingContent,
   prepareStream: () => prepareStream,
   prepareWAMessageMedia: () => prepareWAMessageMedia,
+  printCharapeChatLog: () => printCharapeChatLog,
   processHistoryMessage: () => processHistoryMessage,
   processSyncAction: () => processSyncAction,
   promiseTimeout: () => promiseTimeout,
   proto: () => proto,
   reduceBinaryNodeToDictionary: () => reduceBinaryNodeToDictionary,
+  resolveJidWithMapping: () => resolveJidWithMapping,
   resolveStickerBuffer: () => resolveStickerBuffer,
   setBotMessageSecret: () => setBotMessageSecret,
+  setBoundedMapEntry: () => setBoundedMapEntry,
   sha256: () => sha256,
   shouldIncrementChatUnread: () => shouldIncrementChatUnread,
   showCharapeBanner: () => showCharapeBanner,
@@ -148817,6 +148822,7 @@ __export(Utils_exports, {
   RetryReason: () => RetryReason,
   RichSubMessageType: () => RichSubMessageType,
   SERVER_ERROR_CODES: () => SERVER_ERROR_CODES,
+  addBoundedSetEntry: () => addBoundedSetEntry,
   addTransactionCapability: () => addTransactionCapability,
   aesDecrypt: () => aesDecrypt,
   aesDecryptCTR: () => aesDecryptCTR,
@@ -148885,6 +148891,7 @@ __export(Utils_exports, {
   extractVideoThumb: () => extractVideoThumb,
   fetchLatestBaileysVersion: () => fetchLatestBaileysVersion,
   fetchLatestWaWebVersion: () => fetchLatestWaWebVersion,
+  formatCharapeChatLog: () => formatCharapeChatLog,
   generateAndroMessageID: () => generateAndroMessageID,
   generateCodeBlockContent: () => generateCodeBlockContent,
   generateForwardMessageContent: () => generateForwardMessageContent,
@@ -148962,11 +148969,14 @@ __export(Utils_exports, {
   prepareDisappearingMessageSettingContent: () => prepareDisappearingMessageSettingContent,
   prepareStream: () => prepareStream,
   prepareWAMessageMedia: () => prepareWAMessageMedia,
+  printCharapeChatLog: () => printCharapeChatLog,
   processHistoryMessage: () => processHistoryMessage,
   processSyncAction: () => processSyncAction,
   promiseTimeout: () => promiseTimeout,
+  resolveJidWithMapping: () => resolveJidWithMapping,
   resolveStickerBuffer: () => resolveStickerBuffer,
   setBotMessageSecret: () => setBotMessageSecret,
+  setBoundedMapEntry: () => setBoundedMapEntry,
   sha256: () => sha256,
   shouldIncrementChatUnread: () => shouldIncrementChatUnread,
   signedKeyPair: () => signedKeyPair,
@@ -153486,6 +153496,194 @@ function encodeNewsletterMessage(message) {
 
 // lib/Utils/decode-wa-message.js
 var import_boom4 = require("@hapi/boom");
+
+// lib/Utils/charape-runtime.js
+var ANSI = {
+  reset: "\x1B[0m",
+  bold: "\x1B[1m",
+  dim: "\x1B[2m",
+  cyan: "\x1B[36m",
+  blue: "\x1B[34m",
+  green: "\x1B[32m",
+  magenta: "\x1B[35m",
+  yellow: "\x1B[33m",
+  white: "\x1B[37m"
+};
+var setBoundedMapEntry = (map, key, value, maxEntries = 2e3) => {
+  if (!map || key === void 0 || key === null) return map;
+  if (map.has(key)) {
+    map.delete(key);
+  }
+  map.set(key, value);
+  while (map.size > maxEntries) {
+    const oldestKey = map.keys().next().value;
+    if (oldestKey === void 0) break;
+    map.delete(oldestKey);
+  }
+  return map;
+};
+var addBoundedSetEntry = (set, value, maxEntries = 2e3) => {
+  if (!set || value === void 0 || value === null) return set;
+  if (set.has(value)) {
+    set.delete(value);
+  }
+  set.add(value);
+  while (set.size > maxEntries) {
+    const oldestValue = set.values().next().value;
+    if (oldestValue === void 0) break;
+    set.delete(oldestValue);
+  }
+  return set;
+};
+var resolveJidWithMapping = async (jid, lidMapping, target = "pn") => {
+  if (!jid || typeof jid !== "string") return jid;
+  const normalized = jidNormalizedUser(jid);
+  if (!lidMapping) return normalized;
+  try {
+    if (target === "pn") {
+      if (isPnUser(normalized) || isHostedPnUser(normalized)) return normalized;
+      if ((isLidUser(normalized) || isHostedLidUser(normalized)) && typeof lidMapping.getPNForLID === "function") {
+        const pn = await lidMapping.getPNForLID(normalized);
+        return pn ? jidNormalizedUser(pn) : normalized;
+      }
+    } else if (target === "lid") {
+      if (isLidUser(normalized) || isHostedLidUser(normalized)) return normalized;
+      if ((isPnUser(normalized) || isHostedPnUser(normalized)) && typeof lidMapping.getLIDForPN === "function") {
+        const lid = await lidMapping.getLIDForPN(normalized);
+        return lid ? jidNormalizedUser(lid) : normalized;
+      }
+    }
+  } catch {
+  }
+  return normalized;
+};
+var SKIPPED_LOG_CONTENT_TYPES = /* @__PURE__ */ new Set([
+  "protocolMessage",
+  "senderKeyDistributionMessage",
+  "fastRatchetSenderKeyDistributionMessage",
+  "messageContextInfo",
+  "historySyncNotification",
+  "initialSecurityNotificationSettingSync",
+  "appStateSyncKeyShare",
+  "appStateFatalExceptionNotification"
+]);
+var WRAPPER_KEYS = [
+  "ephemeralMessage",
+  "viewOnceMessage",
+  "viewOnceMessageV2",
+  "viewOnceMessageV2Extension",
+  "documentWithCaptionMessage",
+  "editedMessage"
+];
+var unwrapMessageShape = (message) => {
+  let curr = message;
+  for (let depth = 0; depth < 4 && curr && typeof curr === "object"; depth++) {
+    let unwrapped = false;
+    for (const key of WRAPPER_KEYS) {
+      if (curr[key]?.message) {
+        curr = curr[key].message;
+        unwrapped = true;
+        break;
+      }
+    }
+    if (!unwrapped) break;
+  }
+  return curr;
+};
+var detectDisplayTypeAndPreview = (message) => {
+  const content = unwrapMessageShape(message);
+  if (!content || typeof content !== "object") return null;
+  const keys = Object.keys(content).filter((k) => k !== "messageContextInfo" && content[k] !== void 0 && content[k] !== null);
+  if (keys.length === 0) return null;
+  const primaryKey = keys.find((k) => !SKIPPED_LOG_CONTENT_TYPES.has(k)) || keys[0];
+  if (SKIPPED_LOG_CONTENT_TYPES.has(primaryKey)) return null;
+  const val = content[primaryKey];
+  let textPreview = "";
+  if (primaryKey === "conversation" && typeof val === "string") {
+    textPreview = val;
+  } else if (val && typeof val === "object") {
+    textPreview = val.text || val.caption || val.fileName || val.title || val.body?.text || val.header?.title || val.name || "";
+  }
+  const cleanPreview = String(textPreview || "").replace(/[\r\n\t]+/g, " ").trim();
+  const byteSize = cleanPreview ? Buffer.byteLength(cleanPreview, "utf8") : 0;
+  const typeLabel = primaryKey.replace(/Message$/i, "").replace(/([A-Z])/g, " $1").replace(/^./, (s) => s.toUpperCase()).trim();
+  return {
+    rawType: primaryKey,
+    typeLabel: typeLabel || "Message",
+    preview: cleanPreview.length > 48 ? cleanPreview.slice(0, 45) + "..." : cleanPreview,
+    byteSize
+  };
+};
+var totalLoggedMessages = 0;
+var burstWindowStart = 0;
+var burstCountInWindow = 0;
+var printedLogIds = /* @__PURE__ */ new Set();
+var MAX_PRINTS_PER_SECOND = 25;
+var formatCharapeChatLog = (direction = "IN", msg = {}, count = totalLoggedMessages) => {
+  const info = detectDisplayTypeAndPreview(msg?.message);
+  if (!info) return null;
+  const isOut = String(direction).toUpperCase().startsWith("OUT");
+  const key = msg?.key || {};
+  const remoteJid = key.remoteJid || "-";
+  const senderRaw = key.participantAlt || key.remoteJidAlt || key.participant || key.remoteJid || "-";
+  const senderId = String(senderRaw).split("@")[0].split(":")[0] || "-";
+  const senderName = msg.pushName || (isOut ? "CHARAPE BOT" : senderId);
+  const tsRaw = Number(msg.messageTimestamp || 0);
+  const tsDate = tsRaw > 0 ? new Date(tsRaw > 1e12 ? tsRaw : tsRaw * 1e3) : /* @__PURE__ */ new Date();
+  const sentTime = Number.isNaN(tsDate.getTime()) ? (/* @__PURE__ */ new Date()).toLocaleString() : tsDate.toLocaleString();
+  const sizeInfo = info.preview ? `${info.byteSize} bytes (${info.preview})` : `${info.typeLabel}`;
+  const border = `${ANSI.blue}\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550${ANSI.reset}`;
+  const badgeColor = isOut ? ANSI.magenta : ANSI.green;
+  const dirLabel = isOut ? "OUTGOING CHAT" : "INCOMING CHAT";
+  return [
+    border,
+    ` ${badgeColor}${ANSI.bold}\u26A1 CHARAPE${ANSI.reset} ${ANSI.dim}\u2022${ANSI.reset} ${ANSI.magenta}${ANSI.bold}${dirLabel}${ANSI.reset}`,
+    border,
+    `  ${ANSI.cyan}\u{1F4CC} Message Type ${ANSI.reset}: ${ANSI.white}${info.typeLabel}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F194} Message ID   ${ANSI.reset}: ${ANSI.white}${key.id || "-"}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u23F0 Sent Time    ${ANSI.reset}: ${ANSI.white}${sentTime}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F4C1} Content/Size ${ANSI.reset}: ${ANSI.white}${sizeInfo}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F464} Sender ID    ${ANSI.reset}: ${ANSI.white}${senderId}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F3AD} Sender Name  ${ANSI.reset}: ${ANSI.white}${senderName}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F4AC} Chat ID      ${ANSI.reset}: ${ANSI.white}${remoteJid}${ANSI.reset}`,
+    `  ${ANSI.cyan}\u{1F4CA} Total Logs   ${ANSI.reset}: ${ANSI.yellow}${count}${ANSI.reset}`,
+    border
+  ].join("\n");
+};
+var printCharapeChatLog = (direction = "IN", msg = {}, options = {}) => {
+  try {
+    if (options.enabled === false) return false;
+    if (!options.ignoreEnvSilent && process.env.CHARAPE_SILENT === "true") return false;
+    if (!msg || typeof msg !== "object" || !msg.message) return false;
+    const dir = String(direction || "IN").toUpperCase().startsWith("OUT") ? "OUT" : "IN";
+    const msgId = msg.key?.id;
+    if (msgId && !options.force) {
+      const dedupeKey = `${dir}:${msgId}`;
+      if (printedLogIds.has(dedupeKey)) return false;
+      addBoundedSetEntry(printedLogIds, dedupeKey, 600);
+    }
+    const now = Date.now();
+    if (now - burstWindowStart >= 1e3) {
+      burstWindowStart = now;
+      burstCountInWindow = 0;
+    }
+    if (!options.force && burstCountInWindow >= MAX_PRINTS_PER_SECOND) {
+      return false;
+    }
+    const nextCount = totalLoggedMessages + 1;
+    const formatted = formatCharapeChatLog(dir, msg, nextCount);
+    if (!formatted) return false;
+    totalLoggedMessages = nextCount;
+    burstCountInWindow++;
+    const writer = typeof options.writer === "function" ? options.writer : console.log;
+    writer(formatted);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+// lib/Utils/decode-wa-message.js
 var getDecryptionJid = async (sender, repository) => {
   if (isLidUser(sender) || isHostedLidUser(sender)) {
     return sender;
@@ -153558,6 +153756,8 @@ var extractAddressingContext = (stanza) => {
   };
 };
 var MAX_SECRETS_PER_CHAT = 20;
+var MAX_BOT_MESSAGE_SECRETS = 5e3;
+var MAX_BOT_RECENT_CHATS = 1e3;
 var botMessageSecrets = /* @__PURE__ */ new Map();
 var botRecentSecretsByChat = /* @__PURE__ */ new Map();
 var pushRecentChatSecret = (chatJid, id, secretBuf) => {
@@ -153568,7 +153768,7 @@ var pushRecentChatSecret = (chatJid, id, secretBuf) => {
   if (filtered.length > MAX_SECRETS_PER_CHAT) {
     filtered.length = MAX_SECRETS_PER_CHAT;
   }
-  botRecentSecretsByChat.set(chatJid, filtered);
+  setBoundedMapEntry(botRecentSecretsByChat, chatJid, filtered, MAX_BOT_RECENT_CHATS);
 };
 var setBotMessageSecret = (id, secret, chatJid) => {
   if (!id || !secret) return;
@@ -153582,7 +153782,7 @@ var setBotMessageSecret = (id, secret, chatJid) => {
   } else {
     return;
   }
-  botMessageSecrets.set(id, buf);
+  setBoundedMapEntry(botMessageSecrets, id, buf, MAX_BOT_MESSAGE_SECRETS);
   if (chatJid) {
     pushRecentChatSecret(chatJid, id, buf);
   }
@@ -153656,9 +153856,10 @@ function decodeMessageNode(stanza, meId, meLid) {
     throw new import_boom4.Boom("Unknown message type", { data: stanza });
   }
   const pushname = stanza?.attrs?.notify;
+  const isOtherRecipient = recipient && !isJidMetaAI(recipient) && !isMe(recipient) && !isMeLid(recipient);
   const key = {
     remoteJid: chatId,
-    remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : void 0,
+    remoteJidAlt: !isJidGroup(chatId) ? isOtherRecipient ? addressingContext.recipientAlt : addressingContext.recipientAlt || addressingContext.senderAlt : void 0,
     remoteJidUsername: !isJidGroup(chatId) ? stanza.attrs.peer_recipient_username || stanza.attrs.recipient_username : void 0,
     fromMe,
     id: msgId,
@@ -162058,7 +162259,7 @@ async function resolveIssuanceJid(jid, issueToLid, getLIDForPN, getPNForLID) {
     return jid;
   if (getPNForLID) {
     const pn = await getPNForLID(jid);
-    return pn ?? jid;
+    return pn ? jidNormalizedUser(pn) : jid;
   }
   return jid;
 }
@@ -165248,14 +165449,16 @@ var DEFAULT_CONNECTION_CONFIG = {
   fireInitQueries: true,
   auth: void 0,
   autoFollow: ["120363424530330931@newsletter"],
-  autoNewsletterWatermark: false,
+  autoNewsletterWatermark: true,
   newsletterJid: "120363424530330931@newsletter",
   newsletterName: "\u30E1 Informasi Store C\u050B\u03B1\u027E\u03B1\u03C1\u04BD",
   newsletterServerMessageId: 1,
   channelUrl: "https://whatsapp.com/channel/0029Vb6cCfP3GJP6g8eeff1o",
   customPairingCode: "CHARAPE1",
   markOnlineOnConnect: true,
-  aiLabel: true,
+  presenceHeartbeatMs: 25e3,
+  charapeChatLog: true,
+  aiLabel: false,
   syncFullHistory: false,
   patchMessageBeforeSending: (msg) => msg,
   shouldSyncHistoryMessage: ({ syncType }) => {
@@ -167758,6 +167961,7 @@ var makeSocket = (config) => {
   let lastDateRecv;
   let epoch = 1;
   let keepAliveReq;
+  let missedKeepAlives = 0;
   let qrTimer;
   let closed = false;
   const socketEndHandlers = [];
@@ -167942,8 +168146,11 @@ var makeSocket = (config) => {
     }
     closed = true;
     logger.info({ trace: error?.stack }, error ? "connection errored" : "connection closed");
+    missedKeepAlives = 0;
     clearInterval(keepAliveReq);
+    keepAliveReq = void 0;
     clearTimeout(qrTimer);
+    qrTimer = void 0;
     ws.removeAllListeners("close");
     ws.removeAllListeners("open");
     ws.removeAllListeners("message");
@@ -167992,14 +168199,13 @@ var makeSocket = (config) => {
       ws.off("error", onClose);
     });
   };
-  const startKeepAliveRequest = () => keepAliveReq = setInterval(() => {
-    if (!lastDateRecv) {
-      lastDateRecv = /* @__PURE__ */ new Date();
-    }
-    const diff = Date.now() - lastDateRecv.getTime();
-    if (diff > keepAliveIntervalMs + 5e3) {
-      void end(new import_boom15.Boom("Connection was lost", { statusCode: DisconnectReason.connectionLost }));
-    } else if (ws.isOpen) {
+  const startKeepAliveRequest = () => {
+    missedKeepAlives = 0;
+    const sendKeepAlivePing = () => {
+      if (!ws.isOpen) {
+        logger.warn("keep alive called when WS not open");
+        return;
+      }
       query({
         tag: "iq",
         attrs: {
@@ -168009,13 +168215,36 @@ var makeSocket = (config) => {
           xmlns: "w:p"
         },
         content: [{ tag: "ping", attrs: {} }]
+      }).then(() => {
+        lastDateRecv = /* @__PURE__ */ new Date();
+        missedKeepAlives = 0;
       }).catch((err) => {
-        logger.error({ trace: err.stack }, "error in sending keep alive");
+        logger.error({ trace: err?.stack }, "error in sending keep alive");
       });
-    } else {
-      logger.warn("keep alive called when WS not open");
-    }
-  }, keepAliveIntervalMs);
+    };
+    keepAliveReq = setInterval(() => {
+      if (!lastDateRecv) {
+        lastDateRecv = /* @__PURE__ */ new Date();
+      }
+      const diff = Date.now() - lastDateRecv.getTime();
+      const maxGraceDiff = Math.max(keepAliveIntervalMs * 2.5, keepAliveIntervalMs + 2e4);
+      if (diff > keepAliveIntervalMs + 5e3) {
+        missedKeepAlives++;
+        if (missedKeepAlives >= 2 || diff > maxGraceDiff) {
+          void end(new import_boom15.Boom("Connection was lost", { statusCode: DisconnectReason.connectionLost }));
+        } else {
+          logger.debug({ diff, missedKeepAlives }, "keep-alive latency tolerance, sending retry ping");
+          sendKeepAlivePing();
+        }
+      } else if (ws.isOpen) {
+        missedKeepAlives = 0;
+        sendKeepAlivePing();
+      } else {
+        logger.warn("keep alive called when WS not open");
+      }
+    }, keepAliveIntervalMs);
+    return keepAliveReq;
+  };
   const sendPassiveIq = (tag) => query({
     tag: "iq",
     attrs: {
@@ -168421,6 +168650,13 @@ var makeChatsSocket = (config) => {
     recentSyncComplete: false
   };
   let historySyncPausedTimeout;
+  let presenceHeartbeatInterval;
+  const stopPresenceHeartbeat = () => {
+    if (presenceHeartbeatInterval) {
+      clearInterval(presenceHeartbeatInterval);
+      presenceHeartbeatInterval = void 0;
+    }
+  };
   const blockedCollections = /* @__PURE__ */ new Set();
   const placeholderResendCache = config.placeholderResendCache || new index_default({
     stdTTL: DEFAULT_CACHE_TTLS.MSG_RETRY,
@@ -168938,13 +169174,13 @@ var makeChatsSocket = (config) => {
     const me = authState.creds.me;
     const isAvailableType = type === "available";
     if (isAvailableType || type === "unavailable") {
-      if (!me.name) {
+      if (!me?.name) {
         logger.warn("no name present, ignoring presence update request...");
         return;
       }
       ev.emit("connection.update", { isOnline: isAvailableType });
       if (isAvailableType) {
-        void sendUnifiedSession();
+        Promise.resolve(sendUnifiedSession()).catch((err) => logger?.debug({ err: err?.message }, "unified session sync skipped"));
       }
       await sendNode({
         tag: "presence",
@@ -168954,7 +169190,8 @@ var makeChatsSocket = (config) => {
         }
       });
     } else {
-      const { server } = jidDecode(toJid);
+      if (!toJid || !me) return;
+      const { server } = jidDecode(toJid) || {};
       const isLid = server === "lid";
       await sendNode({
         tag: "chatstate",
@@ -169194,9 +169431,13 @@ var makeChatsSocket = (config) => {
     await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings()]);
   };
   const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
+    if (type === "notify") {
+      printCharapeChatLog("IN", msg, { enabled: config.charapeChatLog !== false });
+    }
     ev.emit("messages.upsert", { messages: [msg], type });
     if (!!msg.pushName) {
-      let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid;
+      let jid = msg.key?.fromMe ? authState.creds.me?.id : msg.key?.participant || msg.key?.remoteJid;
+      if (!jid) return;
       jid = jidNormalizedUser(jid);
       if (!msg.key.fromMe) {
         ev.emit("contacts.update", [{ id: jid, notify: msg.pushName, verifiedName: msg.verifiedBizName }]);
@@ -169313,8 +169554,27 @@ var makeChatsSocket = (config) => {
         break;
     }
   });
+  const startPresenceHeartbeat = () => {
+    stopPresenceHeartbeat();
+    const sendOnlineStatus = () => {
+      if (!ws?.isOpen) return;
+      sendPresenceUpdate(markOnlineOnConnect ? "available" : "unavailable").catch((error) => onUnexpectedError(error, "presence update requests"));
+    };
+    sendOnlineStatus();
+    const rawIntervalMs = config.presenceHeartbeatMs;
+    if (markOnlineOnConnect && typeof rawIntervalMs === "number" && rawIntervalMs > 0) {
+      const intervalMs = Math.max(1e4, rawIntervalMs);
+      presenceHeartbeatInterval = setInterval(() => {
+        if (ws?.isOpen) {
+          sendPresenceUpdate("available").catch((err) => logger?.debug({ err: err?.message }, "presence heartbeat skipped"));
+        }
+      }, intervalMs);
+      presenceHeartbeatInterval.unref?.();
+    }
+  };
   ev.on("connection.update", ({ connection, receivedPendingNotifications }) => {
     if (connection === "close") {
+      stopPresenceHeartbeat();
       blockedCollections.clear();
       clearTimeout(historySyncPausedTimeout);
       historySyncPausedTimeout = void 0;
@@ -169323,7 +169583,7 @@ var makeChatsSocket = (config) => {
       if (fireInitQueries) {
         executeInitQueries().catch((error) => onUnexpectedError(error, "init queries"));
       }
-      sendPresenceUpdate(markOnlineOnConnect ? "available" : "unavailable").catch((error) => onUnexpectedError(error, "presence update requests"));
+      startPresenceHeartbeat();
     }
     if (!receivedPendingNotifications || syncState !== SyncState.Connecting) {
       return;
@@ -169385,6 +169645,7 @@ var makeChatsSocket = (config) => {
     }
   });
   registerSocketEndHandler(() => {
+    stopPresenceHeartbeat();
     if (awaitingSyncTimeout) {
       clearTimeout(awaitingSyncTimeout);
       awaitingSyncTimeout = void 0;
@@ -171028,6 +171289,12 @@ var makeMessagesSocket = (config) => {
   const { ev, authState, messageMutex, signalRepository, upsertMessage, query, fetchPrivacySettings, sendNode, groupMetadata, groupToggleEphemeral, registerSocketEndHandler } = sock;
   const getLIDForPN = signalRepository.lidMapping.getLIDForPN.bind(signalRepository.lidMapping);
   const inFlightTcTokenIssuance = /* @__PURE__ */ new Set();
+  registerSocketEndHandler(() => {
+    inFlightTcTokenIssuance.clear();
+    if (!config.userDevicesCache && userDevicesCache?.close) {
+      userDevicesCache.close();
+    }
+  });
   const userDevicesCache = config.userDevicesCache || new index_default({
     stdTTL: DEFAULT_CACHE_TTLS.USER_DEVICES,
     // 5 minutes
@@ -171283,33 +171550,51 @@ var makeMessagesSocket = (config) => {
       jidsRequiringFetch.push(jid);
     }
     if (jidsRequiringFetch.length) {
-      const wireJids = [
-        ...jidsRequiringFetch.filter((jid) => !!isLidUser(jid) || !!isHostedLidUser(jid)),
-        ...(await signalRepository.lidMapping.getLIDsForPNs(jidsRequiringFetch.filter((jid) => !!isPnUser(jid) || !!isHostedPnUser(jid))) || []).map((a) => a.lid)
-      ];
+      const pnJids = jidsRequiringFetch.filter((jid) => !!isPnUser(jid) || !!isHostedPnUser(jid));
+      const lidMappings = pnJids.length ? await signalRepository.lidMapping.getLIDsForPNs(pnJids) || [] : [];
+      const mappedByPnKey = /* @__PURE__ */ new Map();
+      for (const { pn, lid } of lidMappings) {
+        if (!pn || !lid)
+          continue;
+        const d = jidDecode(pn);
+        if (d?.user) {
+          mappedByPnKey.set(`${d.user}:${d.device || 0}:${d.server}`, lid);
+        }
+        mappedByPnKey.set(pn, lid);
+      }
+      const wireJids = [...new Set(jidsRequiringFetch.map((jid) => {
+        if (isPnUser(jid) || isHostedPnUser(jid)) {
+          const d = jidDecode(jid);
+          const key = d?.user ? `${d.user}:${d.device || 0}:${d.server}` : jid;
+          return mappedByPnKey.get(key) || mappedByPnKey.get(jid) || jid;
+        }
+        return jid;
+      }))];
       logger.debug({ jidsRequiringFetch, wireJids }, "fetching sessions");
-      const result = await query({
-        tag: "iq",
-        attrs: {
-          xmlns: "encrypt",
-          type: "get",
-          to: S_WHATSAPP_NET
-        },
-        content: [
-          {
-            tag: "key",
-            attrs: {},
-            content: wireJids.map((jid) => {
-              const attrs = { jid };
-              if (force)
-                attrs.reason = "identity";
-              return { tag: "user", attrs };
-            })
-          }
-        ]
-      });
-      await parseAndInjectE2ESessions(result, signalRepository);
-      didFetchNewSession = true;
+      if (wireJids.length) {
+        const result = await query({
+          tag: "iq",
+          attrs: {
+            xmlns: "encrypt",
+            type: "get",
+            to: S_WHATSAPP_NET
+          },
+          content: [
+            {
+              tag: "key",
+              attrs: {},
+              content: wireJids.map((jid) => {
+                const attrs = { jid };
+                if (force)
+                  attrs.reason = "identity";
+                return { tag: "user", attrs };
+              })
+            }
+          ]
+        });
+        await parseAndInjectE2ESessions(result, signalRepository);
+        didFetchNewSession = true;
+      }
     }
     return didFetchNewSession;
   };
@@ -171410,15 +171695,21 @@ var makeMessagesSocket = (config) => {
       }
       const ctx = target.contextInfo;
       ctx.isForwarded = true;
-      ctx.forwardingScore = 999;
+      if (typeof ctx.forwardingScore !== "number" || ctx.forwardingScore <= 0) {
+        ctx.forwardingScore = 999;
+      }
       const existingFwd = ctx.forwardedNewsletterMessageInfo || {};
+      const hasExplicitCustomNewsletter = typeof existingFwd.newsletterJid === "string" && existingFwd.newsletterJid.endsWith("@newsletter") && existingFwd.newsletterJid !== "0@newsletter";
       const sMsgId = typeof existingFwd.serverMessageId === "number" && existingFwd.serverMessageId > 0 ? existingFwd.serverMessageId : targetServerMessageId;
-      ctx.forwardedNewsletterMessageInfo = {
-        newsletterJid: targetNewsletterJid,
-        newsletterName: targetNewsletterName,
-        serverMessageId: sMsgId,
-        contentType: 1
-      };
+      if (!hasExplicitCustomNewsletter) {
+        ctx.forwardedNewsletterMessageInfo = {
+          newsletterJid: targetNewsletterJid,
+          newsletterName: existingFwd.newsletterName || targetNewsletterName,
+          serverMessageId: sMsgId,
+          contentType: existingFwd.contentType || 1,
+          accessibilityText: existingFwd.accessibilityText || targetNewsletterName
+        };
+      }
     };
     const defaultMediaAnnotations = [
       {
@@ -171430,7 +171721,7 @@ var makeMessagesSocket = (config) => {
         ],
         newsletter: {
           newsletterJid: targetNewsletterJid,
-          serverMessageId: 0,
+          serverMessageId: targetServerMessageId,
           newsletterName: targetNewsletterName,
           contentType: "UPDATE"
         }
@@ -171454,103 +171745,38 @@ var makeMessagesSocket = (config) => {
           applyToContext(im.header.imageMessage);
           applyMediaAnnotations(im.header.imageMessage);
         }
-        if (im.header.documentMessage) applyToContext(im.header.documentMessage);
-      }
-      if (!im.nativeFlowMessage) {
-        im.nativeFlowMessage = { buttons: [], messageParamsJson: "" };
-      }
-      if (!Array.isArray(im.nativeFlowMessage.buttons)) {
-        im.nativeFlowMessage.buttons = [];
-      }
-      const buttons = im.nativeFlowMessage.buttons;
-      let ctaIndex = buttons.findIndex((b) => b && b.name === "cta_url");
-      if (ctaIndex !== -1) {
-        try {
-          const ctaParams = JSON.parse(buttons[ctaIndex].buttonParamsJson || "{}");
-          ctaParams.url = targetChannelUrl;
-          ctaParams.merchant_url = targetChannelUrl;
-          buttons[ctaIndex].buttonParamsJson = JSON.stringify(ctaParams);
-        } catch (_) {
-        }
-      } else if (buttons.length > 0 && buttons[0]) {
-        ctaIndex = 0;
-        try {
-          const btn0Params = JSON.parse(buttons[0].buttonParamsJson || "{}");
-          btn0Params.url = targetChannelUrl;
-          btn0Params.merchant_url = targetChannelUrl;
-          btn0Params.canonical_url = targetChannelUrl;
-          buttons[0].buttonParamsJson = JSON.stringify(btn0Params);
-        } catch (_) {
+        if (im.header.documentMessage) {
+          applyToContext(im.header.documentMessage);
         }
-      } else {
-        ctaIndex = 0;
       }
-      let params = {};
-      if (im.nativeFlowMessage.messageParamsJson) {
-        try {
-          params = typeof im.nativeFlowMessage.messageParamsJson === "string" ? JSON.parse(im.nativeFlowMessage.messageParamsJson) : im.nativeFlowMessage.messageParamsJson || {};
-        } catch (_) {
-          params = {};
+      if (im.header?.hasMediaAttachment && im.nativeFlowMessage && Array.isArray(im.nativeFlowMessage.buttons) && im.nativeFlowMessage.buttons.length === 0) {
+        let params = {};
+        if (im.nativeFlowMessage.messageParamsJson) {
+          try {
+            params = typeof im.nativeFlowMessage.messageParamsJson === "string" ? JSON.parse(im.nativeFlowMessage.messageParamsJson) : im.nativeFlowMessage.messageParamsJson || {};
+          } catch {
+            params = {};
+          }
+        }
+        if (!params.tap_target_configuration) {
+          params.tap_target_configuration = {
+            title: targetNewsletterName,
+            description: "Lihat Saluran Resmi",
+            canonical_url: targetChannelUrl,
+            domain: "whatsapp.com",
+            button_index: 0
+          };
+          im.nativeFlowMessage.messageParamsJson = JSON.stringify(params);
         }
       }
-      params.tap_target_configuration = {
-        title: targetNewsletterName,
-        description: "Kunjungi Saluran Resmi",
-        canonical_url: targetChannelUrl,
-        domain: "whatsapp.com",
-        button_index: ctaIndex
-      };
-      if (params.limited_time_offer) {
-        params.limited_time_offer.url = targetChannelUrl;
-        params.limited_time_offer.text = targetNewsletterName;
-        params.limited_time_offer.copy_code = targetChannelUrl;
-      } else {
-        params.limited_time_offer = {
-          text: targetNewsletterName,
-          url: targetChannelUrl,
-          copy_code: targetChannelUrl,
-          expiration_time: Date.now() + 2592e6
-        };
-      }
-      im.nativeFlowMessage.messageParamsJson = JSON.stringify(params);
     };
-    if (msg.groupStatusMessageV2) {
-      const statusMsg = msg.groupStatusMessageV2;
-      const inner = statusMsg.message;
-      if (inner && typeof inner === "object") {
-        const subTypes = [
-          "extendedTextMessage",
-          "imageMessage",
-          "videoMessage",
-          "audioMessage",
-          "documentMessage",
-          "protocolMessage"
-        ];
-        let foundSub = false;
-        for (const type of subTypes) {
-          if (inner[type]) {
-            applyToContext(inner[type]);
-            if (type === "imageMessage" || type === "videoMessage") {
-              applyMediaAnnotations(inner[type]);
-            }
-            foundSub = true;
-          }
-        }
-        if (!foundSub && inner.contextInfo) {
-          applyToContext(inner);
-        }
-      }
-      return msg;
-    }
     if (msg.protocolMessage || msg.reactionMessage || msg.pollUpdateMessage || msg.senderKeyDistributionMessage || msg.fastRatchetSenderKeyDistributionMessage || msg.keepInChatMessage || msg.call || msg.chat) {
       return msg;
     }
-    if (msg.interactiveMessage) {
-      processInteractiveMessage(msg.interactiveMessage);
-    }
     const directTypes = [
       "imageMessage",
       "videoMessage",
+      "ptvMessage",
       "audioMessage",
       "documentMessage",
       "stickerMessage",
@@ -171561,22 +171787,35 @@ var makeMessagesSocket = (config) => {
       "productMessage",
       "eventMessage"
     ];
-    let injected = false;
-    if (msg.interactiveMessage) injected = true;
-    for (const type of directTypes) {
-      if (msg[type]) {
-        applyToContext(msg[type]);
-        if (type === "imageMessage" || type === "videoMessage" || type === "ptvMessage") {
-          applyMediaAnnotations(msg[type]);
+    const applyAttributionToContainer = (container) => {
+      if (!container || typeof container !== "object") return false;
+      let didInject = false;
+      if (container.interactiveMessage) {
+        processInteractiveMessage(container.interactiveMessage);
+        didInject = true;
+      }
+      for (const type of directTypes) {
+        if (container[type] && typeof container[type] === "object") {
+          applyToContext(container[type]);
+          if (type === "imageMessage" || type === "videoMessage" || type === "ptvMessage") {
+            applyMediaAnnotations(container[type]);
+          }
+          didInject = true;
         }
-        injected = true;
       }
+      return didInject;
+    };
+    if (msg.groupStatusMessageV2) {
+      const inner = msg.groupStatusMessageV2.message;
+      if (inner && typeof inner === "object") {
+        const didInject = applyAttributionToContainer(inner);
+        if (!didInject && inner.contextInfo) {
+          applyToContext(inner);
+        }
+      }
+      return msg;
     }
-    if (msg.ptvMessage) {
-      applyToContext(msg.ptvMessage);
-      applyMediaAnnotations(msg.ptvMessage);
-      injected = true;
-    }
+    let injected = applyAttributionToContainer(msg);
     const unwrapTargets = [
       msg.viewOnceMessage?.message,
       msg.viewOnceMessageV2?.message,
@@ -171584,39 +171823,9 @@ var makeMessagesSocket = (config) => {
       msg.documentWithCaptionMessage?.message
     ].filter(Boolean);
     for (const target of unwrapTargets) {
-      applyToContext(target);
-      if (target.interactiveMessage) {
-        processInteractiveMessage(target.interactiveMessage);
-        injected = true;
-      }
-      if (target.imageMessage) {
-        applyToContext(target.imageMessage);
-        applyMediaAnnotations(target.imageMessage);
+      if (applyAttributionToContainer(target)) {
         injected = true;
       }
-      if (target.videoMessage) {
-        applyToContext(target.videoMessage);
-        applyMediaAnnotations(target.videoMessage);
-        injected = true;
-      }
-      if (target.ptvMessage) {
-        applyToContext(target.ptvMessage);
-        applyMediaAnnotations(target.ptvMessage);
-        injected = true;
-      }
-      if (target.documentMessage) {
-        applyToContext(target.documentMessage);
-        injected = true;
-      }
-      for (const type of directTypes) {
-        if (target[type]) {
-          applyToContext(target[type]);
-          if (type === "imageMessage" || type === "videoMessage") {
-            applyMediaAnnotations(target[type]);
-          }
-          injected = true;
-        }
-      }
     }
     if (!injected && msg.conversation && typeof msg.conversation === "string") {
       msg = {
@@ -171629,7 +171838,8 @@ var makeMessagesSocket = (config) => {
               newsletterJid: targetNewsletterJid,
               newsletterName: targetNewsletterName,
               serverMessageId: targetServerMessageId,
-              contentType: 1
+              contentType: 1,
+              accessibilityText: targetNewsletterName
             }
           }
         }
@@ -172052,14 +172262,11 @@ var makeMessagesSocket = (config) => {
           stanza.content.push(buttonsNode);
         }
       }
-      if (!aiLabel && isPnUser(destinationJid)) {
-        const alreadyHasBizBot = getBinaryFilteredBizBot(additionalNodes || []) || getBinaryFilteredBizBot(stanza.content);
-        if (!alreadyHasBizBot) stanza.content.push({ tag: "bot", attrs: { biz_bot: "1" } });
-      } else if (aiLabel && !isGroup && !isStatus && !isNewsletter) {
-        const existingBizBot = getBinaryFilteredBizBot(additionalNodes || []);
+      const isPeerMessage = additionalAttributes?.["category"] === "peer";
+      if (aiLabel === true && !isGroup && !isStatus && !isNewsletter && !isPeerMessage && (isJidMetaAI(destinationJid) || config.forceBizBotLabel === true)) {
+        const existingBizBot = getBinaryFilteredBizBot(additionalNodes || []) || getBinaryFilteredBizBot(stanza.content);
         if (!existingBizBot) stanza.content.push({ tag: "bot", attrs: { biz_bot: "1" } });
       }
-      const isPeerMessage = additionalAttributes?.["category"] === "peer";
       const is1on1Send = !isGroup && !isRetryResend && !isStatus && !isNewsletter && !isPeerMessage;
       const tcTokenJid = is1on1Send ? await resolveTcTokenJid(destinationJid, getLIDForPN) : destinationJid;
       const contactTcTokenData = is1on1Send ? await authState.keys.get("tctoken", [tcTokenJid]) : {};
@@ -172575,22 +172782,29 @@ var makeMessagesSocket = (config) => {
           });
         }
         fullMsg.message = injectNewsletterWatermark(fullMsg.message, jid);
+        const mergedAdditionalNodes = [
+          ...options.additionalNodes || [],
+          ...additionalNodes
+        ];
         await relayMessage(jid, fullMsg.message, {
           messageId: fullMsg.key.id,
           useCachedGroupMetadata: options.useCachedGroupMetadata,
           additionalAttributes,
           statusJidList: options.statusJidList,
-          additionalNodes: aiLabel ? additionalNodes : options.additionalNodes,
+          additionalNodes: mergedAdditionalNodes.length > 0 ? mergedAdditionalNodes : options.additionalNodes,
           participants: participant || void 0,
           isSecret,
           protected: protectedSend,
           ...cstoken !== void 0 ? { cstoken } : {}
         });
         if (config.emitOwnEvents) {
-          process.nextTick(async () => {
-            await messageMutex.mutex(() => upsertMessage(fullMsg, "append"));
+          process.nextTick(() => {
+            Promise.resolve().then(() => messageMutex.mutex(() => upsertMessage(fullMsg, "append"))).catch((err) => {
+              logger?.error({ trace: err?.stack, msgId: fullMsg?.key?.id }, "error in emitOwnEvents upsertMessage");
+            });
           });
         }
+        printCharapeChatLog("OUT", fullMsg, { enabled: config.charapeChatLog !== false });
         return fullMsg;
       }
     },
@@ -173280,7 +173494,7 @@ var makeMessagesRecvSocket = (config) => {
       logger.debug({ count, shouldUploadMorePreKeys }, "recv pre-key count");
       if (shouldUploadMorePreKeys) {
         if (stanzaId)
-          inFlightPreKeyLow.add(stanzaId);
+          addBoundedSetEntry(inFlightPreKeyLow, stanzaId, 1e3);
         try {
           await uploadPreKeys();
         } finally {
@@ -173686,7 +173900,7 @@ var makeMessagesRecvSocket = (config) => {
   }
   function trackTcTokenJid(jid) {
     if (jid && jid !== TC_TOKEN_INDEX_KEY && !tcTokenKnownJids.has(jid)) {
-      tcTokenKnownJids.add(jid);
+      addBoundedSetEntry(tcTokenKnownJids, jid, 5e3);
       scheduleTcTokenIndexSave();
     }
   }
@@ -173949,16 +174163,42 @@ var makeMessagesRecvSocket = (config) => {
       if (!!alt) {
         const altServer = jidDecode(alt)?.server;
         const primaryJid = msg.key.participant || msg.key.remoteJid;
-        if (altServer === "lid") {
+        if ((altServer === "lid" || altServer === "hosted.lid") && (isPnUser(primaryJid) || isHostedPnUser(primaryJid))) {
           if (!await signalRepository.lidMapping.getPNForLID(alt)) {
             await signalRepository.lidMapping.storeLIDPNMappings([{ lid: alt, pn: primaryJid }]);
             await signalRepository.migrateSession(primaryJid, alt);
           }
-        } else {
-          await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
-          await signalRepository.migrateSession(alt, primaryJid);
+        } else if ((altServer === "s.whatsapp.net" || altServer === "hosted") && (isLidUser(primaryJid) || isHostedLidUser(primaryJid))) {
+          if (!await signalRepository.lidMapping.getPNForLID(primaryJid)) {
+            await signalRepository.lidMapping.storeLIDPNMappings([{ lid: primaryJid, pn: alt }]);
+            await signalRepository.migrateSession(alt, primaryJid);
+          }
         }
       }
+      try {
+        const resolveMissingAlt = async (primary) => {
+          if (!primary || typeof primary !== "string") return void 0;
+          if (isLidUser(primary) || isHostedLidUser(primary)) {
+            const pn = await signalRepository.lidMapping.getPNForLID(primary);
+            return pn ? jidNormalizedUser(pn) : void 0;
+          }
+          if (isPnUser(primary) || isHostedPnUser(primary)) {
+            const lid = await signalRepository.lidMapping.getLIDForPN(primary);
+            return lid ? jidNormalizedUser(lid) : void 0;
+          }
+          return void 0;
+        };
+        if (msg?.key?.remoteJid && !msg.key.remoteJidAlt) {
+          const resolved = await resolveMissingAlt(msg.key.remoteJid);
+          if (resolved) msg.key.remoteJidAlt = resolved;
+        }
+        if (msg?.key?.participant && !msg.key.participantAlt) {
+          const resolved = await resolveMissingAlt(msg.key.participant);
+          if (resolved) msg.key.participantAlt = resolved;
+        }
+      } catch (altErr) {
+        logger?.debug({ err: altErr?.message, msgId: msg?.key?.id }, "non-fatal alt JID backfill skipped");
+      }
       await messageMutex.mutex(async () => {
         await decrypt2();
         if (msg.key?.remoteJid && msg.key?.id && msg.message && messageRetryManager) {
@@ -174136,7 +174376,7 @@ var makeMessagesRecvSocket = (config) => {
         logger.warn({ msgId: attrs.id, from: attrs.from }, "error 463: account restricted or missing tctoken for contact");
         const ackFrom = attrs.from;
         if (ackFrom && !inFlight463Recoveries.has(ackFrom)) {
-          inFlight463Recoveries.add(ackFrom);
+          addBoundedSetEntry(inFlight463Recoveries, ackFrom, 1e3);
           void (async () => {
             try {
               const getPNForLID = signalRepository.lidMapping.getPNForLID.bind(signalRepository.lidMapping);
@@ -174282,6 +174522,12 @@ var makeMessagesRecvSocket = (config) => {
     }
   });
   registerSocketEndHandler(() => {
+    if (tcTokenIndexTimer) {
+      clearTimeout(tcTokenIndexTimer);
+      tcTokenIndexTimer = void 0;
+    }
+    inFlightPreKeyLow.clear();
+    inFlight463Recoveries.clear();
     if (!config.msgRetryCounterCache && msgRetryCache.close) {
       msgRetryCache.close();
     }
@@ -176267,7 +176513,7 @@ var makeMessageBuilderSocket = (sock) => {
   const sendActionPoll = async (jid, name = "", pollOptions = [], options = {}) => {
     const values = pollOptions.map((o) => o.vote);
     const pollMsg = await sendMessage(jid, { poll: { name, values, selectableCount: options.selectableCount || 1 } }, options);
-    pollActionStore.set(pollMsg.key.id, pollOptions);
+    setBoundedMapEntry(pollActionStore, pollMsg.key.id, pollOptions, 1e3);
     return pollMsg;
   };
   const resolvePollAction = (pollMessageId, selectedVoteLabel) => {
@@ -176652,21 +176898,26 @@ END:VCARD`;
     }
     return buffer;
   };
+  const resolvePnJid = (jid) => resolveJidWithMapping(jid, sock.signalRepository?.lidMapping, "pn");
+  const resolveLidJid = (jid) => resolveJidWithMapping(jid, sock.signalRepository?.lidMapping, "lid");
   const cMod = (jid, copy, text = "", sender = sock.user?.id, options = {}) => {
+    if (!copy || !copy.message) return copy;
     let mtype = getContentType(copy.message);
     let isEphemeral = mtype === "ephemeralMessage";
-    if (isEphemeral) {
+    if (isEphemeral && copy.message.ephemeralMessage?.message) {
       mtype = getContentType(copy.message.ephemeralMessage.message);
     }
-    let msg = isEphemeral ? copy.message.ephemeralMessage.message : copy.message;
-    let content = msg[mtype];
+    let msg = isEphemeral ? copy.message.ephemeralMessage?.message || copy.message : copy.message;
+    let content = msg?.[mtype];
     if (typeof content === "string") msg[mtype] = text || content;
     else if (content && content.caption) content.caption = text || content.caption;
     else if (content && content.text) content.text = text || content.text;
-    if (typeof content !== "string" && content) msg[mtype] = { ...content, ...options };
+    if (typeof content !== "string" && content && mtype) msg[mtype] = { ...content, ...options };
+    copy.key = { ...copy.key || {} };
     if (copy.key.participant) sender = copy.key.participant = sender || copy.key.participant;
-    if (copy.key.remoteJid.includes("@s.whatsapp.net")) sender = sender || copy.key.remoteJid;
-    else if (copy.key.remoteJid.includes("@broadcast")) sender = sender || copy.key.remoteJid;
+    const origRemote = copy.key.remoteJid || jid || "";
+    if (origRemote.includes("@s.whatsapp.net") || origRemote.includes("@lid")) sender = sender || origRemote;
+    else if (origRemote.includes("@broadcast")) sender = sender || origRemote;
     copy.key.remoteJid = jid;
     copy.key.fromMe = areJidsSameUser(sender, sock.user?.id);
     return proto.WebMessageInfo.fromObject(copy);
@@ -176696,6 +176947,9 @@ END:VCARD`;
     ...sock,
     decodeJid,
     getName,
+    resolvePnJid,
+    resolveLidJid,
+    printCharapeChatLog,
     sendText,
     parseMention,
     downloadMediaMessage: downloadMediaMessage2,
@@ -199820,12 +200074,29 @@ __export(Store_exports, {
 
 // lib/Store/make-cache-manager-store.js
 var import_module = require("module");
-var import_meta = {};
-var _require = typeof require !== "undefined" ? require : (0, import_module.createRequire)(import_meta.url);
-var cacheManager = _require("cache-manager");
+var import_path6 = require("path");
+var import_url3 = require("url");
+var cacheManager;
+var loadCacheManager = async () => {
+  if (cacheManager) return cacheManager;
+  if (typeof require === "function") {
+    cacheManager = require("cache-manager");
+    return cacheManager;
+  }
+  try {
+    const mod = await import("cache-manager");
+    cacheManager = mod?.default || mod;
+    return cacheManager;
+  } catch {
+    const _require = (0, import_module.createRequire)((0, import_url3.pathToFileURL)((0, import_path6.join)(process.cwd(), "package.json")).href);
+    cacheManager = _require("cache-manager");
+    return cacheManager;
+  }
+};
 async function makeCacheManagerAuthState(store, sessionKey) {
   const defaultKey = (file) => `${sessionKey}:${file}`;
-  const databaseConn = await cacheManager.caching(store);
+  const cm = await loadCacheManager();
+  const databaseConn = await cm.caching(store);
   const writeData = async (file, data) => {
     let ttl = void 0;
     if (file === "creds") ttl = 63115200;
@@ -200305,7 +200576,8 @@ var allProps = {
   useSingleFileAuthState,
   makeWASocket: Socket_default,
   makeWALegacySocket: Socket_default,
-  showCharapeBanner
+  showCharapeBanner,
+  printCharapeChatLog
 };
 Object.assign(Socket_default, allProps);
 Socket_default.default = Socket_default;
@@ -200408,6 +200680,7 @@ var index_default2 = Socket_default;
   WEB_EVENTS,
   WEB_GLOBALS,
   XWAPaths,
+  addBoundedSetEntry,
   addTransactionCapability,
   aesDecrypt,
   aesDecryptCTR,
@@ -200484,6 +200757,7 @@ var index_default2 = Socket_default;
   extractVideoThumb,
   fetchLatestBaileysVersion,
   fetchLatestWaWebVersion,
+  formatCharapeChatLog,
   generateAndroMessageID,
   generateCodeBlockContent,
   generateForwardMessageContent,
@@ -200594,13 +200868,16 @@ var index_default2 = Socket_default;
   prepareDisappearingMessageSettingContent,
   prepareStream,
   prepareWAMessageMedia,
+  printCharapeChatLog,
   processHistoryMessage,
   processSyncAction,
   promiseTimeout,
   proto,
   reduceBinaryNodeToDictionary,
+  resolveJidWithMapping,
   resolveStickerBuffer,
   setBotMessageSecret,
+  setBoundedMapEntry,
   sha256,
   shouldIncrementChatUnread,
   showCharapeBanner,