@lazyneoaz/metachat 6.0.1 → 6.0.2

package/dist/index.cjs

@@ -84866,6 +84866,48 @@ function parseMentions(prng) {
     return [];
   }
 }
+function getMentionsFromDeltaMessage(m) {
+  const body = m?.body || "";
+  const mentions = {};
+  const prngCandidates = [m?.data?.prng, m?.messageMetadata?.data?.prng];
+  for (const prng of prngCandidates) {
+    const mdata = parseMentions(prng);
+    if (mdata.length > 0) {
+      for (const row of mdata) {
+        const o = parseInt(String(row?.o ?? ""), 10) || 0;
+        const l = parseInt(String(row?.l ?? ""), 10) || 0;
+        mentions[String(row?.i)] = body.substring(o, o + l);
+      }
+      return mentions;
+    }
+  }
+  const collectFromRangeMap = (rangeMap) => {
+    const mapData = rangeMap?.asMap?.data;
+    if (!mapData || typeof mapData !== "object") return;
+    for (const key of Object.keys(mapData)) {
+      const d = mapData[key]?.asMap?.data;
+      if (!d) continue;
+      const rawId = d.id?.asLong != null ? d.id.asLong : d.id;
+      if (rawId == null) continue;
+      const offset = parseInt(String(d.offset?.asLong ?? d.offset ?? 0), 10) || 0;
+      const length = parseInt(String(d.length?.asLong ?? d.length ?? 0), 10) || 0;
+      mentions[String(rawId)] = body.substring(offset, offset + length);
+    }
+  };
+  for (const root2 of [m?.data?.data, m?.messageMetadata?.data?.data]) {
+    if (!root2 || typeof root2 !== "object") continue;
+    collectFromRangeMap(root2.Gb);
+    if (Object.keys(mentions).length > 0) break;
+    for (const key of Object.keys(root2)) {
+      const candidate = root2[key];
+      if (candidate && candidate.asMap && candidate.asMap.data) {
+        collectFromRangeMap(candidate);
+      }
+    }
+    if (Object.keys(mentions).length > 0) break;
+  }
+  return mentions;
+}
 function getAdminTextMessageType(type) {
   switch (type) {
     case "unpin_messages_v2":
@@ -84894,12 +84936,12 @@ function getAdminTextMessageType(type) {
 }
 function formatDeltaMessage(m) {
   const md = m.delta.messageMetadata || {};
-  const mdata = parseMentions(m.delta.data?.prng);
   const body = m.delta.body || "";
-  const mentions = {};
-  for (const mention of mdata) {
-    mentions[mention.i] = body.substring(mention.o, mention.o + mention.l);
-  }
+  const mentions = getMentionsFromDeltaMessage({
+    body,
+    data: m.delta.data,
+    messageMetadata: md
+  });
   const messageReply = m.delta.messageReply ? {
     messageID: m.delta.messageReply.messageID,
     senderID: formatID(m.delta.messageReply.senderID),
@@ -84935,11 +84977,11 @@ function formatDeltaNewMessage(m) {
   const threadID = formatID((threadKey.threadFbId || threadKey.otherUserFbId || "").toString());
   const senderID = md.actorFbId ? formatID(md.actorFbId.toString()) : "";
   const body = m.body || "";
-  const mdata = parseMentions(m.data?.prng);
-  const mentions = {};
-  for (const mention of mdata) {
-    mentions[mention.i] = body.substring(mention.o, mention.o + mention.l);
-  }
+  const mentions = getMentionsFromDeltaMessage({
+    body,
+    data: m.data,
+    messageMetadata: md
+  });
   const rawAttachments = Array.isArray(m.attachments) ? m.attachments : [];
   const attachments = rawAttachments.map((att) => {
     try {

package/dist/index.mjs

@@ -84834,6 +84834,48 @@ function parseMentions(prng) {
     return [];
   }
 }
+function getMentionsFromDeltaMessage(m) {
+  const body = m?.body || "";
+  const mentions = {};
+  const prngCandidates = [m?.data?.prng, m?.messageMetadata?.data?.prng];
+  for (const prng of prngCandidates) {
+    const mdata = parseMentions(prng);
+    if (mdata.length > 0) {
+      for (const row of mdata) {
+        const o = parseInt(String(row?.o ?? ""), 10) || 0;
+        const l = parseInt(String(row?.l ?? ""), 10) || 0;
+        mentions[String(row?.i)] = body.substring(o, o + l);
+      }
+      return mentions;
+    }
+  }
+  const collectFromRangeMap = (rangeMap) => {
+    const mapData = rangeMap?.asMap?.data;
+    if (!mapData || typeof mapData !== "object") return;
+    for (const key of Object.keys(mapData)) {
+      const d = mapData[key]?.asMap?.data;
+      if (!d) continue;
+      const rawId = d.id?.asLong != null ? d.id.asLong : d.id;
+      if (rawId == null) continue;
+      const offset = parseInt(String(d.offset?.asLong ?? d.offset ?? 0), 10) || 0;
+      const length = parseInt(String(d.length?.asLong ?? d.length ?? 0), 10) || 0;
+      mentions[String(rawId)] = body.substring(offset, offset + length);
+    }
+  };
+  for (const root2 of [m?.data?.data, m?.messageMetadata?.data?.data]) {
+    if (!root2 || typeof root2 !== "object") continue;
+    collectFromRangeMap(root2.Gb);
+    if (Object.keys(mentions).length > 0) break;
+    for (const key of Object.keys(root2)) {
+      const candidate = root2[key];
+      if (candidate && candidate.asMap && candidate.asMap.data) {
+        collectFromRangeMap(candidate);
+      }
+    }
+    if (Object.keys(mentions).length > 0) break;
+  }
+  return mentions;
+}
 function getAdminTextMessageType(type) {
   switch (type) {
     case "unpin_messages_v2":
@@ -84862,12 +84904,12 @@ function getAdminTextMessageType(type) {
 }
 function formatDeltaMessage(m) {
   const md = m.delta.messageMetadata || {};
-  const mdata = parseMentions(m.delta.data?.prng);
   const body = m.delta.body || "";
-  const mentions = {};
-  for (const mention of mdata) {
-    mentions[mention.i] = body.substring(mention.o, mention.o + mention.l);
-  }
+  const mentions = getMentionsFromDeltaMessage({
+    body,
+    data: m.delta.data,
+    messageMetadata: md
+  });
   const messageReply = m.delta.messageReply ? {
     messageID: m.delta.messageReply.messageID,
     senderID: formatID(m.delta.messageReply.senderID),
@@ -84903,11 +84945,11 @@ function formatDeltaNewMessage(m) {
   const threadID = formatID((threadKey.threadFbId || threadKey.otherUserFbId || "").toString());
   const senderID = md.actorFbId ? formatID(md.actorFbId.toString()) : "";
   const body = m.body || "";
-  const mdata = parseMentions(m.data?.prng);
-  const mentions = {};
-  for (const mention of mdata) {
-    mentions[mention.i] = body.substring(mention.o, mention.o + mention.l);
-  }
+  const mentions = getMentionsFromDeltaMessage({
+    body,
+    data: m.data,
+    messageMetadata: md
+  });
   const rawAttachments = Array.isArray(m.attachments) ? m.attachments : [];
   const attachments = rawAttachments.map((att) => {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "A modern TypeScript Facebook Chat API client for building reliable Messenger bots, with built-in anti-detection protection, automatic cookie refresh, music search, and AI theme support.",
   "license": "MIT",
   "author": {
@@ -57,7 +57,7 @@
     "prepublishOnly": "npm run build",
     "lint": "npm run typecheck",
     "format": "prettier --write \"src/**/*.ts\" \"index.ts\"",
-    "test": "npm run build && node test/smoke.test.cjs && node test/smoke.test.mjs && node test/music-search.test.cjs && node test/mqtt-lifecycle.test.cjs && node test/session-reliability.test.cjs && node test/anti-detection.test.cjs && node test/account-safety.test.cjs && node test/liveness.test.cjs && node test/recovery.test.cjs && node test/cookie-acquisition.test.cjs && node test/realtime-health.test.cjs && node test/attachment-resilience.test.cjs && node test/reaction-validation.test.cjs && node test/api-surface-fixes.test.cjs && node test/threadinfo-regression.test.cjs && node test/new-modules.test.cjs",
+    "test": "npm run build && node test/smoke.test.cjs && node test/smoke.test.mjs && node test/music-search.test.cjs && node test/mqtt-lifecycle.test.cjs && node test/session-reliability.test.cjs && node test/anti-detection.test.cjs && node test/account-safety.test.cjs && node test/liveness.test.cjs && node test/recovery.test.cjs && node test/cookie-acquisition.test.cjs && node test/realtime-health.test.cjs && node test/attachment-resilience.test.cjs && node test/reaction-validation.test.cjs && node test/api-surface-fixes.test.cjs && node test/threadinfo-regression.test.cjs && node test/new-modules.test.cjs && node test/mention-parsing.test.cjs",
     "audit": "npm audit",
     "audit:fix": "npm audit fix"
   },