@lazyneoaz/metachat 6.0.4 → 6.0.6

package/dist/index.cjs

@@ -85890,7 +85890,7 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
     }
   }
   if (!state.inflight) {
-    state.inflight = scrapeTokens(ctx, defaultFuncs, state).finally(() => {
+    state.inflight = scrapeTokens(ctx, defaultFuncs, state, force).finally(() => {
       state.inflight = null;
     });
   }
@@ -85900,10 +85900,11 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
   }
   applyCached(ctx, state);
 }
-async function scrapeTokens(ctx, defaultFuncs, state) {
+async function scrapeTokens(ctx, defaultFuncs, state, force = false) {
   state.attemptedAt = Date.now();
   try {
-    const res = await defaultFuncs.get("https://www.facebook.com/", ctx.jar);
+    const url2 = force ? `https://www.facebook.com/?_nc_hashed_token=${Date.now().toString(36)}${Math.floor(Math.random() * 1e6).toString(36)}` : "https://www.facebook.com/";
+    const res = await defaultFuncs.get(url2, ctx.jar);
     const html3 = htmlOf(res);
     if (!html3) {
       state.failures++;
@@ -89022,7 +89023,7 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     }, null);
     return messageInfo;
   }
-  return async function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
+  const sendMessageCore = async function(msg, threadID, callback, replyToMessage, isGroup) {
     if (typeof isGroup === "undefined") isGroup = null;
     if (!callback && (getType(threadID) === "Function" || getType(threadID) === "AsyncFunction")) {
       throw new Error("Pass a threadID as a second argument.");
@@ -89046,11 +89047,13 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     if (msgType !== "String" && msgType !== "Object") {
       const err = new Error("Message should be of type string or object and not " + msgType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     if (threadIDType !== "Array" && threadIDType !== "Number" && threadIDType !== "String") {
       const err = new Error("ThreadID should be of type number, string, or array and not " + threadIDType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     if (messageIDType === "Function" || messageIDType === "Undefined" || messageIDType === "Null") {
@@ -89058,6 +89061,7 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     } else if (replyToMessage && messageIDType !== "String") {
       const err = new Error("MessageID should be of type string and not " + messageIDType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     let isSingleUser = null;
@@ -89315,6 +89319,12 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
       }
     }
   };
+  return function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
+    const promise = sendMessageCore(msg, threadID, callback, replyToMessage, isGroup);
+    if (typeof callback === "function") promise.catch(() => {
+    });
+    return promise;
+  };
 };
 
 // src/deltas/apis/messaging/sendTypingIndicator.ts
@@ -90326,9 +90336,9 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
       cacheResult(ctx, cacheKey, result);
       return result;
     }
-    for (let retry = 0; retry < 3; retry++) {
-      await sleep(1200 + retry * 1300 + Math.floor(Math.random() * 400));
-      const retried = await attempt(retry === 2 || !hasCometTokens(ctx));
+    for (let retry = 0; retry < 6; retry++) {
+      await sleep(1e3 + retry * 600 + Math.floor(Math.random() * 350));
+      const retried = await attempt(retry >= 3 || !hasCometTokens(ctx));
       if (isStaleTokenError(retried) || retried?.error || (retried?.errors || []).length) continue;
       const retryPage = collectTracks(retried);
       const retryTracks = retryPage.tracks.slice(0, count);
@@ -90958,6 +90968,8 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
+    returnPromise.catch(() => {
+    });
     const userCallback = typeof callback === "function" ? callback : null;
     let finished2 = false;
     const finish = (err, data2) => {
@@ -90974,51 +90986,14 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
     if (!callback) {
       callback = finish;
     }
+    const done = () => userCallback ? returnPromise.then(() => null, () => null) : returnPromise;
     if (!ctx.mqttClient || !ctx.mqttClient.connected) {
       const error2 = new Error("MQTT client is not connected. Cannot send message.");
       finish(error2);
-      return returnPromise;
+      return done();
     }
     const timestamp = Date.now();
-    const otid = generateOfflineThreadingID();
-    const epoch_id = (BigInt(Date.now()) << 22n).toString();
-    const request_id = ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
-    const payload = getSendPayload(threadID, msg, otid);
-    const tasks = [{
-      label: "46",
-      payload,
-      queue_name: threadID.toString(),
-      task_id: 400,
-      failure_count: null
-    }, {
-      label: "21",
-      payload: {
-        thread_id: threadID.toString(),
-        last_read_watermark_ts: timestamp,
-        sync_group: 1
-      },
-      queue_name: threadID.toString(),
-      task_id: 401,
-      failure_count: null
-    }];
-    if (replyToMessage) {
-      tasks[0].payload.reply_metadata = {
-        reply_source_id: replyToMessage,
-        reply_source_type: 1,
-        reply_type: 0
-      };
-    }
-    const form = {
-      app_id: "2220391788200892",
-      payload: {
-        tasks,
-        epoch_id,
-        version_id: "24804310205905615",
-        data_trace_id: `#${Buffer.from(String(Math.random())).toString("base64").replace(/=+$/g, "")}`
-      },
-      request_id,
-      type: 3
-    };
+    let attachmentIds = null;
     if (msg.attachment) {
       try {
         const inputs = Array.isArray(msg.attachment) ? msg.attachment : [msg.attachment];
@@ -91035,20 +91010,62 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
             ids.push(file && typeof file === "object" ? String(Object.values(file)[0]) : String(file));
           }
         }
-        form.payload.tasks[0].payload.attachment_fbids = ids;
+        attachmentIds = ids;
       } catch (err) {
         error("Attachment upload failed:", err);
         callback(err);
-        return returnPromise;
+        return done();
       }
     }
-    form.payload.tasks.forEach((task) => {
-      task.payload = JSON.stringify(task.payload);
-    });
-    form.payload = JSON.stringify(form.payload);
-    const fallbackMessageID = `mid.${otid}`;
     const mqttClient = ctx.mqttClient;
-    const result = await new Promise((resolve) => {
+    const buildForm = () => {
+      const otid = generateOfflineThreadingID();
+      const epoch_id = (BigInt(Date.now()) << 22n).toString();
+      const request_id = ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
+      const payload = getSendPayload(threadID, msg, otid);
+      if (attachmentIds) payload.attachment_fbids = attachmentIds;
+      const tasks = [{
+        label: "46",
+        payload,
+        queue_name: threadID.toString(),
+        task_id: 400,
+        failure_count: null
+      }, {
+        label: "21",
+        payload: {
+          thread_id: threadID.toString(),
+          last_read_watermark_ts: Date.now(),
+          sync_group: 1
+        },
+        queue_name: threadID.toString(),
+        task_id: 401,
+        failure_count: null
+      }];
+      if (replyToMessage) {
+        tasks[0].payload.reply_metadata = {
+          reply_source_id: replyToMessage,
+          reply_source_type: 1,
+          reply_type: 0
+        };
+      }
+      const form = {
+        app_id: "2220391788200892",
+        payload: {
+          tasks,
+          epoch_id,
+          version_id: "24804310205905615",
+          data_trace_id: `#${Buffer.from(String(Math.random())).toString("base64").replace(/=+$/g, "")}`
+        },
+        request_id,
+        type: 3
+      };
+      form.payload.tasks.forEach((task) => {
+        task.payload = JSON.stringify(task.payload);
+      });
+      form.payload = JSON.stringify(form.payload);
+      return { form, request_id, otid };
+    };
+    const publishAndWait = (form, request_id) => new Promise((resolve) => {
       let settled = false;
       let timer = null;
       const cleanup = () => {
@@ -91088,10 +91105,12 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
               threadIDFromAck = String(node[2][1]);
             }
             if (node[1] === "markOptimisticMessageFailed") {
-              failure = { error: "Couldn't send.", errorDescription: "Message failed on server." };
+              const detail = typeof node[3] === "string" ? node[3] : "Message failed on server.";
+              failure = { error: detail, errorDescription: "Message failed on server." };
             }
             if (node[1] === "updateSubscriptErrorMessage" || node[1] === "fatalError") {
-              serverError = typeof node[3] === "string" ? node[3] : "Couldn't send.";
+              const detail = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
+              serverError = detail;
             }
           }
           for (const child of node) visit(child);
@@ -91112,24 +91131,33 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       });
       timer = setTimeout(() => settle2({ timeout: true }), 15e3);
     });
+    let result = null;
+    let lastOtid = "";
+    for (let attempt = 0; attempt < 3; attempt++) {
+      const built = buildForm();
+      lastOtid = built.otid;
+      result = await publishAndWait(built.form, built.request_id);
+      if (!result.failure && !result.serverError) break;
+      if (attempt < 2) await sleep(700 + attempt * 900 + Math.floor(Math.random() * 400));
+    }
     if (result.failure || result.serverError) {
       const err = result.failure || { error: result.serverError };
       if (err.error && err.error === 1545012) {
         warn("sendMessageMqtt [MQTT]", `Got error 1545012. Bot is not part of the conversation ${threadID}`);
         finish(null, null);
-        return returnPromise;
+        return done();
       }
       error("sendMessageMqtt", "Send failed:", err.error || err);
       finish(err);
-      return returnPromise;
+      return done();
     }
     finish(null, {
       threadID: result.threadID || threadID.toString(),
-      messageID: result.messageID || fallbackMessageID,
+      messageID: result.messageID || `mid.${lastOtid}`,
       timestamp,
       type: replyToMessage ? "message_reply" : "message"
     });
-    return returnPromise;
+    return done();
   };
 };
 

package/dist/index.mjs

@@ -85858,7 +85858,7 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
     }
   }
   if (!state.inflight) {
-    state.inflight = scrapeTokens(ctx, defaultFuncs, state).finally(() => {
+    state.inflight = scrapeTokens(ctx, defaultFuncs, state, force).finally(() => {
       state.inflight = null;
     });
   }
@@ -85868,10 +85868,11 @@ async function ensureCometTokens(ctx, defaultFuncs, force = false) {
   }
   applyCached(ctx, state);
 }
-async function scrapeTokens(ctx, defaultFuncs, state) {
+async function scrapeTokens(ctx, defaultFuncs, state, force = false) {
   state.attemptedAt = Date.now();
   try {
-    const res = await defaultFuncs.get("https://www.facebook.com/", ctx.jar);
+    const url2 = force ? `https://www.facebook.com/?_nc_hashed_token=${Date.now().toString(36)}${Math.floor(Math.random() * 1e6).toString(36)}` : "https://www.facebook.com/";
+    const res = await defaultFuncs.get(url2, ctx.jar);
     const html3 = htmlOf(res);
     if (!html3) {
       state.failures++;
@@ -88990,7 +88991,7 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     }, null);
     return messageInfo;
   }
-  return async function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
+  const sendMessageCore = async function(msg, threadID, callback, replyToMessage, isGroup) {
     if (typeof isGroup === "undefined") isGroup = null;
     if (!callback && (getType(threadID) === "Function" || getType(threadID) === "AsyncFunction")) {
       throw new Error("Pass a threadID as a second argument.");
@@ -89014,11 +89015,13 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     if (msgType !== "String" && msgType !== "Object") {
       const err = new Error("Message should be of type string or object and not " + msgType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     if (threadIDType !== "Array" && threadIDType !== "Number" && threadIDType !== "String") {
       const err = new Error("ThreadID should be of type number, string, or array and not " + threadIDType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     if (messageIDType === "Function" || messageIDType === "Undefined" || messageIDType === "Null") {
@@ -89026,6 +89029,7 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
     } else if (replyToMessage && messageIDType !== "String") {
       const err = new Error("MessageID should be of type string and not " + messageIDType + ".");
       settle2(err);
+      if (legacyCallback) return null;
       throw err;
     }
     let isSingleUser = null;
@@ -89283,6 +89287,12 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
       }
     }
   };
+  return function sendMessage(msg, threadID, callback, replyToMessage, isGroup) {
+    const promise = sendMessageCore(msg, threadID, callback, replyToMessage, isGroup);
+    if (typeof callback === "function") promise.catch(() => {
+    });
+    return promise;
+  };
 };
 
 // src/deltas/apis/messaging/sendTypingIndicator.ts
@@ -90294,9 +90304,9 @@ function searchMusic_default(defaultFuncs, _api, ctx) {
       cacheResult(ctx, cacheKey, result);
       return result;
     }
-    for (let retry = 0; retry < 3; retry++) {
-      await sleep(1200 + retry * 1300 + Math.floor(Math.random() * 400));
-      const retried = await attempt(retry === 2 || !hasCometTokens(ctx));
+    for (let retry = 0; retry < 6; retry++) {
+      await sleep(1e3 + retry * 600 + Math.floor(Math.random() * 350));
+      const retried = await attempt(retry >= 3 || !hasCometTokens(ctx));
       if (isStaleTokenError(retried) || retried?.error || (retried?.errors || []).length) continue;
       const retryPage = collectTracks(retried);
       const retryTracks = retryPage.tracks.slice(0, count);
@@ -90926,6 +90936,8 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
+    returnPromise.catch(() => {
+    });
     const userCallback = typeof callback === "function" ? callback : null;
     let finished2 = false;
     const finish = (err, data2) => {
@@ -90942,51 +90954,14 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
     if (!callback) {
       callback = finish;
     }
+    const done = () => userCallback ? returnPromise.then(() => null, () => null) : returnPromise;
     if (!ctx.mqttClient || !ctx.mqttClient.connected) {
       const error2 = new Error("MQTT client is not connected. Cannot send message.");
       finish(error2);
-      return returnPromise;
+      return done();
     }
     const timestamp = Date.now();
-    const otid = generateOfflineThreadingID();
-    const epoch_id = (BigInt(Date.now()) << 22n).toString();
-    const request_id = ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
-    const payload = getSendPayload(threadID, msg, otid);
-    const tasks = [{
-      label: "46",
-      payload,
-      queue_name: threadID.toString(),
-      task_id: 400,
-      failure_count: null
-    }, {
-      label: "21",
-      payload: {
-        thread_id: threadID.toString(),
-        last_read_watermark_ts: timestamp,
-        sync_group: 1
-      },
-      queue_name: threadID.toString(),
-      task_id: 401,
-      failure_count: null
-    }];
-    if (replyToMessage) {
-      tasks[0].payload.reply_metadata = {
-        reply_source_id: replyToMessage,
-        reply_source_type: 1,
-        reply_type: 0
-      };
-    }
-    const form = {
-      app_id: "2220391788200892",
-      payload: {
-        tasks,
-        epoch_id,
-        version_id: "24804310205905615",
-        data_trace_id: `#${Buffer.from(String(Math.random())).toString("base64").replace(/=+$/g, "")}`
-      },
-      request_id,
-      type: 3
-    };
+    let attachmentIds = null;
     if (msg.attachment) {
       try {
         const inputs = Array.isArray(msg.attachment) ? msg.attachment : [msg.attachment];
@@ -91003,20 +90978,62 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
             ids.push(file && typeof file === "object" ? String(Object.values(file)[0]) : String(file));
           }
         }
-        form.payload.tasks[0].payload.attachment_fbids = ids;
+        attachmentIds = ids;
       } catch (err) {
         error("Attachment upload failed:", err);
         callback(err);
-        return returnPromise;
+        return done();
       }
     }
-    form.payload.tasks.forEach((task) => {
-      task.payload = JSON.stringify(task.payload);
-    });
-    form.payload = JSON.stringify(form.payload);
-    const fallbackMessageID = `mid.${otid}`;
     const mqttClient = ctx.mqttClient;
-    const result = await new Promise((resolve) => {
+    const buildForm = () => {
+      const otid = generateOfflineThreadingID();
+      const epoch_id = (BigInt(Date.now()) << 22n).toString();
+      const request_id = ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
+      const payload = getSendPayload(threadID, msg, otid);
+      if (attachmentIds) payload.attachment_fbids = attachmentIds;
+      const tasks = [{
+        label: "46",
+        payload,
+        queue_name: threadID.toString(),
+        task_id: 400,
+        failure_count: null
+      }, {
+        label: "21",
+        payload: {
+          thread_id: threadID.toString(),
+          last_read_watermark_ts: Date.now(),
+          sync_group: 1
+        },
+        queue_name: threadID.toString(),
+        task_id: 401,
+        failure_count: null
+      }];
+      if (replyToMessage) {
+        tasks[0].payload.reply_metadata = {
+          reply_source_id: replyToMessage,
+          reply_source_type: 1,
+          reply_type: 0
+        };
+      }
+      const form = {
+        app_id: "2220391788200892",
+        payload: {
+          tasks,
+          epoch_id,
+          version_id: "24804310205905615",
+          data_trace_id: `#${Buffer.from(String(Math.random())).toString("base64").replace(/=+$/g, "")}`
+        },
+        request_id,
+        type: 3
+      };
+      form.payload.tasks.forEach((task) => {
+        task.payload = JSON.stringify(task.payload);
+      });
+      form.payload = JSON.stringify(form.payload);
+      return { form, request_id, otid };
+    };
+    const publishAndWait = (form, request_id) => new Promise((resolve) => {
       let settled = false;
       let timer = null;
       const cleanup = () => {
@@ -91056,10 +91073,12 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
               threadIDFromAck = String(node[2][1]);
             }
             if (node[1] === "markOptimisticMessageFailed") {
-              failure = { error: "Couldn't send.", errorDescription: "Message failed on server." };
+              const detail = typeof node[3] === "string" ? node[3] : "Message failed on server.";
+              failure = { error: detail, errorDescription: "Message failed on server." };
             }
             if (node[1] === "updateSubscriptErrorMessage" || node[1] === "fatalError") {
-              serverError = typeof node[3] === "string" ? node[3] : "Couldn't send.";
+              const detail = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
+              serverError = detail;
             }
           }
           for (const child of node) visit(child);
@@ -91080,24 +91099,33 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       });
       timer = setTimeout(() => settle2({ timeout: true }), 15e3);
     });
+    let result = null;
+    let lastOtid = "";
+    for (let attempt = 0; attempt < 3; attempt++) {
+      const built = buildForm();
+      lastOtid = built.otid;
+      result = await publishAndWait(built.form, built.request_id);
+      if (!result.failure && !result.serverError) break;
+      if (attempt < 2) await sleep(700 + attempt * 900 + Math.floor(Math.random() * 400));
+    }
     if (result.failure || result.serverError) {
       const err = result.failure || { error: result.serverError };
       if (err.error && err.error === 1545012) {
         warn("sendMessageMqtt [MQTT]", `Got error 1545012. Bot is not part of the conversation ${threadID}`);
         finish(null, null);
-        return returnPromise;
+        return done();
       }
       error("sendMessageMqtt", "Send failed:", err.error || err);
       finish(err);
-      return returnPromise;
+      return done();
     }
     finish(null, {
       threadID: result.threadID || threadID.toString(),
-      messageID: result.messageID || fallbackMessageID,
+      messageID: result.messageID || `mid.${lastOtid}`,
       timestamp,
       type: replyToMessage ? "message_reply" : "message"
     });
-    return returnPromise;
+    return done();
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "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 && node test/mention-parsing.test.cjs && node test/pending-support.test.cjs && node test/music-token-resilience.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 && node test/pending-support.test.cjs && node test/music-token-resilience.test.cjs && node test/send-failure.test.cjs",
     "audit": "npm audit",
     "audit:fix": "npm audit fix"
   },