@lazyneoaz/metachat 6.0.0 → 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 {
@@ -93854,10 +93896,11 @@ var MQTT_TOPICS = [
 ];
 var getJitter = (range) => Math.floor(Math.random() * (range * 2 + 1)) - range;
 var MQTT_CONFIG = {
-  get KEEPALIVE_INTERVAL() {
-    return 60 + Math.floor(Math.random() * 30);
-  },
-  CONNECT_TIMEOUT: 6e4,
+  // The broker expects a ping every 30s. A longer keepalive lets the socket
+  // sit past the broker's own idle window and get reaped, so match the value
+  // the web client uses exactly.
+  KEEPALIVE_INTERVAL: 30,
+  CONNECT_TIMEOUT: 12e3,
   get RECONNECT_PERIOD() {
     return 5e3 + Math.floor(Math.random() * 2e3);
   },
@@ -93865,13 +93908,15 @@ var MQTT_CONFIG = {
   QOS_LEVEL: 1,
   // A dropped socket deserves a quick retry; only a refused handshake
   // (explicit throttle) gets the long backoff. Both ramps are jittered.
-  INITIAL_RETRY_DELAY: 4e3,
+  INITIAL_RETRY_DELAY: 2e3,
   MAX_RETRY_DELAY: 3e5,
   RETRY_MULTIPLIER: 2,
-  // A refused handshake (connack returnCode != 0) means we are being
-  // throttled, not that the network blipped: wait much longer before trying.
-  THROTTLE_DELAY: 9e4,
-  MAX_THROTTLE_DELAY: 9e5
+  // A refused handshake (connack returnCode != 0) is usually a transient
+  // limiter blip: the web client simply retries its socket on the normal
+  // short cadence and recovers. Start from the same delay as a drop and only
+  // grow if refusals keep coming, so a one-off refusal never parks the bot.
+  THROTTLE_DELAY: 2e3,
+  MAX_THROTTLE_DELAY: 12e4
 };
 var SYNC_CONFIG = {
   API_VERSION: 11,
@@ -93880,15 +93925,15 @@ var SYNC_CONFIG = {
   ENCODING: "JSON"
 };
 function buildMqttUsername(ctx, sessionID) {
-  const profile = resolveProfile(ctx.globalOptions);
   return {
     u: ctx.userID,
-    s: String(sessionID),
+    s: sessionID,
     chat_on: !!ctx.globalOptions.online,
     fg: false,
     d: ctx.clientID,
     ct: "websocket",
-    aid: ctx.mqttAppID || ctx.appID || "2220391788200892",
+    aid: ctx.mqttAppID || ctx.appID || "219994525426954",
+    aids: null,
     mqtt_sid: "",
     cp: 3,
     ecp: 10,
@@ -93898,9 +93943,8 @@ function buildMqttUsername(ctx, sessionID) {
     no_auto_fg: true,
     gas: null,
     pack: [],
-    a: profile.userAgent,
-    vi: "3",
-    lc: (profile.language || "en-US").replace("-", "_")
+    p: null,
+    php_override: ""
   };
 }
 function buildMqttOptions(ctx, host, username) {
@@ -93948,8 +93992,7 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
     delay: MQTT_CONFIG.INITIAL_RETRY_DELAY,
     throttleDelay: MQTT_CONFIG.THROTTLE_DELAY,
     generation: 0,
-    health: null,
-    healthSupervisor: null
+    health: null
   };
   const log2 = (...args) => log(...args);
   function clearReconnectTimer() {
@@ -93963,13 +94006,6 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
       clearInterval(lifecycle.presenceInterval);
       lifecycle.presenceInterval = null;
     }
-    if (lifecycle.healthSupervisor) {
-      try {
-        lifecycle.healthSupervisor.stop();
-      } catch (_) {
-      }
-      lifecycle.healthSupervisor = null;
-    }
     clearReconnectTimer();
   }
   function destroyClient() {
@@ -94206,79 +94242,6 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
           ctx.mqttConnected = true;
           ctx.lastMqttError = null;
           resetBackoff();
-          if (lifecycle.healthSupervisor) {
-            try {
-              lifecycle.healthSupervisor.stop();
-            } catch (_) {
-            }
-          }
-          lifecycle.healthSupervisor = startRealtimeSupervisor({
-            isConnected: () => generation === lifecycle.generation && client2.connected,
-            // Share the per-connection tracker so this supervisor sees
-            // every inbound frame the listener records.
-            health,
-            reconnect: (reason) => {
-              if (generation !== lifecycle.generation) return;
-              if (lifecycle.stopped || ctx.loggedIn === false) return;
-              log2(`MQTT ${reason}; recycling the socket`);
-              try {
-                client2.end(true);
-              } catch (_) {
-              }
-              const gen = generation;
-              setTimeout(() => {
-                if (gen !== lifecycle.generation) return;
-                if (lifecycle.stopped || ctx.loggedIn === false) return;
-                if (lifecycle.client && lifecycle.client.connected) return;
-                if (lifecycle.reconnectTimer) return;
-                scheduleReconnect("realtime socket recycled");
-              }, 5e3).unref?.();
-            },
-            ping: () => {
-              return new Promise((resolve) => {
-                if (generation !== lifecycle.generation || !client2.connected) {
-                  resolve(false);
-                  return;
-                }
-                const before2 = lifecycle.health ? lifecycle.health.frames : 0;
-                let settled = false;
-                const done = (alive) => {
-                  if (settled) return;
-                  settled = true;
-                  resolve(alive);
-                };
-                const timer = setTimeout(() => {
-                  if (generation !== lifecycle.generation) return done(false);
-                  if (!client2.connected) return done(false);
-                  done(false);
-                }, 8e3);
-                const watcher = () => {
-                  const after2 = lifecycle.health ? lifecycle.health.frames : 0;
-                  if (after2 > before2) {
-                    clearTimeout(timer);
-                    client2.removeListener("packetreceive", watcher);
-                    done(true);
-                  }
-                };
-                client2.on("packetreceive", watcher);
-                try {
-                  client2.ping();
-                } catch {
-                  clearTimeout(timer);
-                  client2.removeListener("packetreceive", watcher);
-                  done(false);
-                }
-              });
-            },
-            onVerdict: (state) => {
-              if (state.verdict === "dead") {
-                warn(
-                  "MQTT health",
-                  `silent for ${Math.round(state.sinceLastFrameMs / 1e3)}s; probing`
-                );
-              }
-            }
-          });
           ctx.__mqttHealth = () => lifecycle.health ? lifecycle.health.state(generation === lifecycle.generation && !!client2.connected) : null;
           api.getBotInitialData().then((botData) => {
             if (botData) {

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 {
@@ -93822,10 +93864,11 @@ var MQTT_TOPICS = [
 ];
 var getJitter = (range) => Math.floor(Math.random() * (range * 2 + 1)) - range;
 var MQTT_CONFIG = {
-  get KEEPALIVE_INTERVAL() {
-    return 60 + Math.floor(Math.random() * 30);
-  },
-  CONNECT_TIMEOUT: 6e4,
+  // The broker expects a ping every 30s. A longer keepalive lets the socket
+  // sit past the broker's own idle window and get reaped, so match the value
+  // the web client uses exactly.
+  KEEPALIVE_INTERVAL: 30,
+  CONNECT_TIMEOUT: 12e3,
   get RECONNECT_PERIOD() {
     return 5e3 + Math.floor(Math.random() * 2e3);
   },
@@ -93833,13 +93876,15 @@ var MQTT_CONFIG = {
   QOS_LEVEL: 1,
   // A dropped socket deserves a quick retry; only a refused handshake
   // (explicit throttle) gets the long backoff. Both ramps are jittered.
-  INITIAL_RETRY_DELAY: 4e3,
+  INITIAL_RETRY_DELAY: 2e3,
   MAX_RETRY_DELAY: 3e5,
   RETRY_MULTIPLIER: 2,
-  // A refused handshake (connack returnCode != 0) means we are being
-  // throttled, not that the network blipped: wait much longer before trying.
-  THROTTLE_DELAY: 9e4,
-  MAX_THROTTLE_DELAY: 9e5
+  // A refused handshake (connack returnCode != 0) is usually a transient
+  // limiter blip: the web client simply retries its socket on the normal
+  // short cadence and recovers. Start from the same delay as a drop and only
+  // grow if refusals keep coming, so a one-off refusal never parks the bot.
+  THROTTLE_DELAY: 2e3,
+  MAX_THROTTLE_DELAY: 12e4
 };
 var SYNC_CONFIG = {
   API_VERSION: 11,
@@ -93848,15 +93893,15 @@ var SYNC_CONFIG = {
   ENCODING: "JSON"
 };
 function buildMqttUsername(ctx, sessionID) {
-  const profile = resolveProfile(ctx.globalOptions);
   return {
     u: ctx.userID,
-    s: String(sessionID),
+    s: sessionID,
     chat_on: !!ctx.globalOptions.online,
     fg: false,
     d: ctx.clientID,
     ct: "websocket",
-    aid: ctx.mqttAppID || ctx.appID || "2220391788200892",
+    aid: ctx.mqttAppID || ctx.appID || "219994525426954",
+    aids: null,
     mqtt_sid: "",
     cp: 3,
     ecp: 10,
@@ -93866,9 +93911,8 @@ function buildMqttUsername(ctx, sessionID) {
     no_auto_fg: true,
     gas: null,
     pack: [],
-    a: profile.userAgent,
-    vi: "3",
-    lc: (profile.language || "en-US").replace("-", "_")
+    p: null,
+    php_override: ""
   };
 }
 function buildMqttOptions(ctx, host, username) {
@@ -93916,8 +93960,7 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
     delay: MQTT_CONFIG.INITIAL_RETRY_DELAY,
     throttleDelay: MQTT_CONFIG.THROTTLE_DELAY,
     generation: 0,
-    health: null,
-    healthSupervisor: null
+    health: null
   };
   const log2 = (...args) => log(...args);
   function clearReconnectTimer() {
@@ -93931,13 +93974,6 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
       clearInterval(lifecycle.presenceInterval);
       lifecycle.presenceInterval = null;
     }
-    if (lifecycle.healthSupervisor) {
-      try {
-        lifecycle.healthSupervisor.stop();
-      } catch (_) {
-      }
-      lifecycle.healthSupervisor = null;
-    }
     clearReconnectTimer();
   }
   function destroyClient() {
@@ -94174,79 +94210,6 @@ var listenMqtt_default = (defaultFuncs, api, ctx) => {
           ctx.mqttConnected = true;
           ctx.lastMqttError = null;
           resetBackoff();
-          if (lifecycle.healthSupervisor) {
-            try {
-              lifecycle.healthSupervisor.stop();
-            } catch (_) {
-            }
-          }
-          lifecycle.healthSupervisor = startRealtimeSupervisor({
-            isConnected: () => generation === lifecycle.generation && client2.connected,
-            // Share the per-connection tracker so this supervisor sees
-            // every inbound frame the listener records.
-            health,
-            reconnect: (reason) => {
-              if (generation !== lifecycle.generation) return;
-              if (lifecycle.stopped || ctx.loggedIn === false) return;
-              log2(`MQTT ${reason}; recycling the socket`);
-              try {
-                client2.end(true);
-              } catch (_) {
-              }
-              const gen = generation;
-              setTimeout(() => {
-                if (gen !== lifecycle.generation) return;
-                if (lifecycle.stopped || ctx.loggedIn === false) return;
-                if (lifecycle.client && lifecycle.client.connected) return;
-                if (lifecycle.reconnectTimer) return;
-                scheduleReconnect("realtime socket recycled");
-              }, 5e3).unref?.();
-            },
-            ping: () => {
-              return new Promise((resolve) => {
-                if (generation !== lifecycle.generation || !client2.connected) {
-                  resolve(false);
-                  return;
-                }
-                const before2 = lifecycle.health ? lifecycle.health.frames : 0;
-                let settled = false;
-                const done = (alive) => {
-                  if (settled) return;
-                  settled = true;
-                  resolve(alive);
-                };
-                const timer = setTimeout(() => {
-                  if (generation !== lifecycle.generation) return done(false);
-                  if (!client2.connected) return done(false);
-                  done(false);
-                }, 8e3);
-                const watcher = () => {
-                  const after2 = lifecycle.health ? lifecycle.health.frames : 0;
-                  if (after2 > before2) {
-                    clearTimeout(timer);
-                    client2.removeListener("packetreceive", watcher);
-                    done(true);
-                  }
-                };
-                client2.on("packetreceive", watcher);
-                try {
-                  client2.ping();
-                } catch {
-                  clearTimeout(timer);
-                  client2.removeListener("packetreceive", watcher);
-                  done(false);
-                }
-              });
-            },
-            onVerdict: (state) => {
-              if (state.verdict === "dead") {
-                warn(
-                  "MQTT health",
-                  `silent for ${Math.round(state.sinceLastFrameMs / 1e3)}s; probing`
-                );
-              }
-            }
-          });
           ctx.__mqttHealth = () => lifecycle.health ? lifecycle.health.state(generation === lifecycle.generation && !!client2.connected) : null;
           api.getBotInitialData().then((botData) => {
             if (botData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "6.0.0",
+  "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"
   },