@lazyneoaz/metachat 6.0.6 → 6.0.8

package/dist/index.cjs

@@ -87484,9 +87484,14 @@ function httpGet_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpGet", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87510,9 +87515,14 @@ function httpPost_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpPost", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87536,9 +87546,14 @@ function httpPostFormData_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpPostFormData", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87901,37 +87916,72 @@ function enableAutoSaveAppState_default(_defaultFuncs, api, ctx) {
 }
 
 // src/deltas/apis/messaging/editMessage.ts
+function extractEditedMessage(message) {
+  try {
+    const candidate = message?.payload?.step?.[1]?.[2]?.[2]?.[1];
+    const messageID = String(candidate?.[2] || "");
+    const body = String(candidate?.[4] || "");
+    return { messageID: messageID || void 0, body: body || void 0 };
+  } catch {
+    return {};
+  }
+}
 function editMessage_default(_defaultFuncs, _api, ctx) {
-  return async function editMessage(text3, messageID, callback) {
+  return function editMessage(text3, messageID, callback) {
     const cb = typeof callback === "function" ? callback : void 0;
-    try {
-      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
-        throw new Error("Not connected to MQTT");
+    const fail = (err) => {
+      error("editMessage", err?.error || err?.message || err);
+      if (cb) {
+        cb(err);
+        return { error: err?.error || err?.message || String(err), success: false };
       }
-      const query = {
-        failure_count: null,
-        label: "742",
-        payload: JSON.stringify({
-          message_id: messageID,
-          text: text3
-        }),
-        queue_name: "edit_message"
-      };
-      const content = buildWsTaskContent(ctx, [query], "6903494529735864");
-      const result = await publishLsRequestWithAck({
-        client: ctx.mqttClient,
-        content,
-        requestId: content.request_id,
-        extract: (parsed) => parsed
-      });
-      const out = { messageID, text: text3, success: !result?.error };
+      throw err;
+    };
+    if (!ctx.mqttClient || !ctx.mqttClient.connected) {
+      return fail(new Error("Not connected to MQTT"));
+    }
+    if (!text3 || !messageID) {
+      return fail(new Error("text and messageID are required"));
+    }
+    const query = {
+      failure_count: null,
+      label: "742",
+      payload: JSON.stringify({
+        message_id: messageID,
+        text: text3
+      }),
+      queue_name: "edit_message"
+    };
+    const content = buildWsTaskContent(ctx, [query], "6903494529735864");
+    const promise = publishLsRequestWithAck({
+      client: ctx.mqttClient,
+      content,
+      requestId: content.request_id,
+      extract: (parsed) => parsed
+    }).then((parsed) => {
+      const { body } = extractEditedMessage(parsed);
+      if (body && body !== text3) {
+        const error2 = { error: "The message is too old or not from you!", success: false };
+        if (cb) {
+          cb(error2);
+          return error2;
+        }
+        throw error2;
+      }
+      const out = { messageID, text: text3, success: true };
       if (cb) cb(null, out);
       return out;
-    } catch (err) {
+    }).catch((err) => {
       error("editMessage", err?.error || err?.message || err);
-      if (cb) return cb(err);
+      if (cb) {
+        cb(err);
+        return { error: err?.error || err?.message || String(err), success: false };
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88146,6 +88196,8 @@ function emoji_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88156,7 +88208,7 @@ function emoji_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88174,6 +88226,8 @@ function emoji_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -88355,6 +88409,8 @@ function gcname_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88365,7 +88421,7 @@ function gcname_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88383,6 +88439,8 @@ function gcname_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -88523,28 +88581,41 @@ function gcrule_default(defaultFuncs, api, ctx) {
 
 // src/deltas/apis/messaging/markAsDelivered.ts
 function markAsDelivered_default(defaultFuncs, api, ctx) {
-  return async function markAsDelivered(threadID, messageID) {
-    if (!threadID || !messageID) {
-      const err = "Error: messageID or threadID is not defined";
+  return function markAsDelivered(threadID, messageID, callback) {
+    const cb = typeof callback === "function" ? callback : void 0;
+    const fail = (err) => {
       error("markAsDelivered", err);
-      throw new Error(err);
+      if (cb) {
+        cb(err);
+        return;
+      }
+      throw err;
+    };
+    if (!threadID || !messageID) {
+      return fail("Error: messageID or threadID is not defined");
     }
     const form = {};
     form["message_ids[0]"] = messageID;
     form["thread_ids[" + threadID + "][0]"] = messageID;
-    try {
-      const resData = await defaultFuncs.post(
-        "https://www.facebook.com/ajax/mercury/delivery_receipts.php",
-        ctx.jar,
-        form
-      ).then(saveCookies(ctx.jar)).then(parseAndCheckLogin(ctx, defaultFuncs));
-      if (resData.error) {
-        throw resData;
-      }
-    } catch (err) {
+    const promise = defaultFuncs.post(
+      "https://www.facebook.com/ajax/mercury/delivery_receipts.php",
+      ctx.jar,
+      form
+    ).then(saveCookies(ctx.jar)).then(parseAndCheckLogin(ctx, defaultFuncs)).then((resData) => {
+      if (resData && resData.error) throw resData;
+      if (cb) cb(null, resData);
+      return resData;
+    }).catch((err) => {
       error("markAsDelivered", err);
+      if (cb) {
+        cb(err);
+        return null;
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88632,20 +88703,27 @@ function markAsRead_default(defaultFuncs, api, ctx) {
 
 // src/deltas/apis/messaging/markAsReadAll.ts
 function markAsReadAll_default(defaultFuncs, api, ctx) {
-  return async function markAsReadAll() {
-    try {
-      const resData = await defaultFuncs.post(
-        "https://www.facebook.com/ajax/mercury/mark_folder_as_read.php",
-        ctx.jar,
-        { folder: "inbox" }
-      );
-      const parsedData = await parseAndCheckLogin(ctx, defaultFuncs)(resData);
-      if (parsedData.error) throw parsedData;
-      return;
-    } catch (err) {
+  return function markAsReadAll(callback) {
+    const cb = typeof callback === "function" ? callback : void 0;
+    const promise = defaultFuncs.post(
+      "https://www.facebook.com/ajax/mercury/mark_folder_as_read.php",
+      ctx.jar,
+      { folder: "inbox" }
+    ).then((resData) => parseAndCheckLogin(ctx, defaultFuncs)(resData)).then((parsedData) => {
+      if (parsedData && parsedData.error) throw parsedData;
+      if (cb) cb(null, parsedData);
+      return parsedData;
+    }).catch((err) => {
       error("markAsReadAll", err);
+      if (cb) {
+        cb(err);
+        return null;
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88673,6 +88751,16 @@ function markAsSeen_default(defaultFuncs, api, ctx) {
         }
         resolveFunc(friendList);
       };
+    } else {
+      const originalCallback = callback;
+      callback = function(err, data2) {
+        try {
+          originalCallback(err, data2);
+        } finally {
+          if (err) resolveFunc(void 0);
+          else resolveFunc(data2);
+        }
+      };
     }
     const form = {
       seen_timestamp
@@ -88724,6 +88812,8 @@ function nickname_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88734,7 +88824,7 @@ function nickname_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88753,6 +88843,8 @@ function nickname_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -89329,8 +89421,9 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
 
 // src/deltas/apis/messaging/sendTypingIndicator.ts
 function sendTypingIndicator_default(defaultFuncs, api, ctx) {
-  return async function sendTypingIndicatorV2(sendTyping, threadID, options, callback) {
+  return function sendTypingIndicatorV2(sendTyping, threadID, options, callback) {
     if (typeof options === "function") {
+      callback = options;
       options = {};
     }
     options = options || {};
@@ -89343,14 +89436,23 @@ function sendTypingIndicator_default(defaultFuncs, api, ctx) {
       actualSendTyping = sendTyping;
       actualThreadID = threadID;
     }
+    const fail = (message) => {
+      const err = new Error(message);
+      if (typeof callback === "function") {
+        callback(err);
+        return Promise.resolve(null);
+      }
+      return Promise.reject(err);
+    };
     if (!actualThreadID) {
-      throw new Error("sendTypingIndicator: threadID is required");
+      return fail("sendTypingIndicator: threadID is required");
     }
     if (!ctx.mqttClient || !ctx.mqttClient.connected) {
-      throw new Error("sendTypingIndicator: not connected to MQTT");
+      return fail("sendTypingIndicator: not connected to MQTT");
     }
     const threadIDs = Array.isArray(actualThreadID) ? actualThreadID : [actualThreadID];
     const attribution = options.type || 0;
+    const publishPromises = [];
     const publishTyping = (tid, isTyping) => {
       ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
       const isGroupThread = String(tid).length >= 16 ? 1 : 0;
@@ -89380,18 +89482,26 @@ function sendTypingIndicator_default(defaultFuncs, api, ctx) {
         );
       });
     };
-    await Promise.all(threadIDs.map((tid) => publishTyping(tid, actualSendTyping)));
     const duration = options.duration || 1e4;
     const autoStop = options.autoStop !== false;
-    if (actualSendTyping && autoStop) {
-      threadIDs.forEach((tid) => {
-        setTimeout(() => {
-          publishTyping(tid, false).catch(() => {
-          });
-        }, duration);
+    threadIDs.forEach((tid) => {
+      const p = publishTyping(tid, actualSendTyping).then(() => {
+        if (actualSendTyping && autoStop) {
+          setTimeout(() => {
+            publishTyping(tid, false).catch(() => {
+            });
+          }, duration);
+        }
+        return true;
       });
+      publishPromises.push(p);
+    });
+    const result = Promise.all(publishPromises).then(() => true);
+    if (typeof callback === "function") {
+      result.then(() => callback(null, true)).catch((err) => callback(err));
+      return result.catch(() => null);
     }
-    return true;
+    return result;
   };
 }
 
@@ -89780,6 +89890,8 @@ function theme_default(defaultFuncs, api, ctx) {
       let currentEpochId = parseInt(generateOfflineThreadingID());
       const createAndPublish = (label, queueName, payload) => {
         currentEpochId = parseInt(generateOfflineThreadingID());
+        if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+        if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
         ctx.wsReqNumber += 1;
         ctx.wsTaskNumber += 1;
         const request_id = ctx.wsReqNumber;
@@ -89886,6 +89998,8 @@ function setThreadTheme_default(defaultFuncs, _api, ctx) {
       }
       throw error2;
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     let baseTaskNumber = ++ctx.wsTaskNumber;
     const makeTask = (label, queueName, extraPayload = {}) => ({
@@ -89907,6 +90021,7 @@ function setThreadTheme_default(defaultFuncs, _api, ctx) {
       { label: 43, queue: "thread_theme", extra: { source: null, payload: null } }
     ];
     const messages = definitions.map(({ label, queue, extra }) => {
+      if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
       ctx.wsReqNumber += 1;
       return {
         app_id: "2220391788200892",
@@ -90057,15 +90172,8 @@ async function publishThreadTask(ctx, label, queueName, payload, versionId, appI
     requestId: content.request_id,
     extract: (parsed) => {
       const body = parsed && parsed.payload;
-      const error2 = body && (body.error || body.errorDescription);
-      if (error2) {
-        const err = new Error(
-          typeof error2 === "string" ? error2 : error2.message || "MQTT task was rejected"
-        );
-        err.error = error2;
-        throw err;
-      }
-      return body || { success: true };
+      if (!body || typeof body !== "object") return { success: true };
+      return body;
     }
   });
 }
@@ -90096,8 +90204,13 @@ function unsendMessage_default(defaultFuncs, _api, ctx) {
       _resolve = resolve;
       _reject = reject;
     });
+    returnPromise.catch(() => {
+    });
     const done = (err, data2) => {
-      if (cb) cb(err, data2);
+      if (cb) {
+        cb(err, data2);
+        return;
+      }
       if (err) _reject(err);
       else _resolve(data2);
     };
@@ -90865,6 +90978,7 @@ function pinMessage_default(defaultFuncs, api, ctx) {
 }
 
 // src/deltas/apis/mqtt/sendMessageMqtt.ts
+var DEFAULT_RETRY_DELAYS_MS = [900, 1600, 2400, 3500, 5e3, 7e3];
 function preUploadedId(item) {
   if (typeof item === "number" && Number.isFinite(item)) return String(item);
   if (typeof item === "string" && /^\d{6,}$/.test(item.trim())) return item.trim();
@@ -91013,7 +91127,7 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
         attachmentIds = ids;
       } catch (err) {
         error("Attachment upload failed:", err);
-        callback(err);
+        finish(err);
         return done();
       }
     }
@@ -91094,6 +91208,7 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
         let threadIDFromAck = null;
         let failure = null;
         let serverError = null;
+        let softFailure = null;
         const steps = parsed.payload?.step;
         const visit = (node) => {
           if (!Array.isArray(node)) return;
@@ -91105,12 +91220,10 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
               threadIDFromAck = String(node[2][1]);
             }
             if (node[1] === "markOptimisticMessageFailed") {
-              const detail = typeof node[3] === "string" ? node[3] : "Message failed on server.";
-              failure = { error: detail, errorDescription: "Message failed on server." };
+              softFailure = typeof node[3] === "string" ? node[3] : "Message failed on server.";
             }
             if (node[1] === "updateSubscriptErrorMessage" || node[1] === "fatalError") {
-              const detail = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
-              serverError = detail;
+              softFailure = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
             }
           }
           for (const child of node) visit(child);
@@ -91120,7 +91233,8 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
           messageID: resolvedMessageID,
           threadID: threadIDFromAck,
           failure,
-          serverError
+          serverError,
+          softFailure
         });
       };
       if (mqttClient && typeof mqttClient.on === "function") {
@@ -91131,14 +91245,21 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       });
       timer = setTimeout(() => settle2({ timeout: true }), 15e3);
     });
+    const retryDelays = (() => {
+      const override = ctx.globalOptions && ctx.globalOptions.mqttSendRetryDelaysMs;
+      return Array.isArray(override) && override.length ? override : DEFAULT_RETRY_DELAYS_MS;
+    })();
     let result = null;
     let lastOtid = "";
-    for (let attempt = 0; attempt < 3; attempt++) {
+    for (let attempt = 0; attempt <= retryDelays.length; 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 && !result.softFailure) break;
+      if ((result.failure || result.serverError) && attempt >= 2) break;
+      if (attempt < retryDelays.length) {
+        await sleep(retryDelays[attempt] + Math.floor(Math.random() * 400));
+      }
     }
     if (result.failure || result.serverError) {
       const err = result.failure || { error: result.serverError };
@@ -91151,6 +91272,21 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       finish(err);
       return done();
     }
+    if (result.softFailure) {
+      warn(
+        "sendMessageMqtt [MQTT]",
+        `Facebook rejected the message (${result.softFailure}); thread ${threadID}. Retried ${retryDelays.length} times without success; continuing without failing the bot.`
+      );
+      finish(null, {
+        threadID: result.threadID || threadID.toString(),
+        messageID: result.messageID || null,
+        timestamp,
+        type: replyToMessage ? "message_reply" : "message",
+        error: result.softFailure,
+        success: false
+      });
+      return done();
+    }
     finish(null, {
       threadID: result.threadID || threadID.toString(),
       messageID: result.messageID || `mid.${lastOtid}`,
@@ -92920,8 +93056,13 @@ function createPoll_default(_defaultFuncs, _api, ctx) {
       _resolve = resolve;
       _reject = reject;
     });
+    promise.catch(() => {
+    });
     const done = (err, data2) => {
-      if (cb) cb(err, data2);
+      if (cb) {
+        cb(err, data2);
+        return;
+      }
       if (err) _reject(err);
       else _resolve(data2);
     };
@@ -93781,7 +93922,7 @@ function parseDelta(defaultFuncs, api, ctx, globalCallback, v) {
   if (v.delta.class == "NewMessage") {
     if (ctx.globalOptions.pageID && ctx.globalOptions.pageID != v.queue) return;
     (function resolveAttachmentUrl(i2) {
-      if (v.delta.attachments && i2 == v.delta.attachments.length) {
+      if (!v.delta.attachments || !Array.isArray(v.delta.attachments) || i2 >= v.delta.attachments.length) {
         let fmtMsg;
         try {
           fmtMsg = formatDeltaMessage(v);
@@ -93972,11 +94113,11 @@ function installTeardownGuard() {
   const isTeardownNoise = (err) => !!err && (err.code === "MQTT_CONNECTION_CLOSED" || /Connection closed|client disconnecting/i.test(String(err && err.message ? err.message : err))) && !/error_gc|1357001|checkpoint/i.test(String(err && err.message ? err.message : err));
   process.on("uncaughtException", (err) => {
     if (isTeardownNoise(err)) return;
-    throw err;
+    error("uncaughtException", err);
   });
   process.on("unhandledRejection", (reason) => {
     if (isTeardownNoise(reason)) return;
-    throw reason;
+    error("unhandledRejection", reason);
   });
 }
 var MQTT_TOPICS = [
@@ -94962,13 +95103,18 @@ async function login(credentials, options, callback) {
     const finish = (error2, loginApi) => {
       if (settled) return;
       settled = true;
+      const hasCallback = typeof callback === "function";
       try {
         callback?.(error2 || null, loginApi);
       } catch (callbackError) {
         error("login callback", callbackError);
       }
-      if (error2) reject(error2);
-      else resolve(loginApi);
+      if (error2) {
+        if (hasCallback) resolve(loginApi);
+        else reject(error2);
+      } else {
+        resolve(loginApi);
+      }
     };
     loginHelper(
       credentials,

package/dist/index.mjs

@@ -87452,9 +87452,14 @@ function httpGet_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpGet", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87478,9 +87483,14 @@ function httpPost_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpPost", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87504,9 +87514,14 @@ function httpPostFormData_default(defaultFuncs, api, ctx) {
       return body;
     }).catch((err) => {
       error("httpPostFormData", err);
-      if (typeof callback === "function") callback(err);
+      if (typeof callback === "function") {
+        callback(err);
+        return null;
+      }
       throw err;
     });
+    returnPromise.catch(() => {
+    });
     return returnPromise;
   };
 }
@@ -87869,37 +87884,72 @@ function enableAutoSaveAppState_default(_defaultFuncs, api, ctx) {
 }
 
 // src/deltas/apis/messaging/editMessage.ts
+function extractEditedMessage(message) {
+  try {
+    const candidate = message?.payload?.step?.[1]?.[2]?.[2]?.[1];
+    const messageID = String(candidate?.[2] || "");
+    const body = String(candidate?.[4] || "");
+    return { messageID: messageID || void 0, body: body || void 0 };
+  } catch {
+    return {};
+  }
+}
 function editMessage_default(_defaultFuncs, _api, ctx) {
-  return async function editMessage(text3, messageID, callback) {
+  return function editMessage(text3, messageID, callback) {
     const cb = typeof callback === "function" ? callback : void 0;
-    try {
-      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
-        throw new Error("Not connected to MQTT");
+    const fail = (err) => {
+      error("editMessage", err?.error || err?.message || err);
+      if (cb) {
+        cb(err);
+        return { error: err?.error || err?.message || String(err), success: false };
       }
-      const query = {
-        failure_count: null,
-        label: "742",
-        payload: JSON.stringify({
-          message_id: messageID,
-          text: text3
-        }),
-        queue_name: "edit_message"
-      };
-      const content = buildWsTaskContent(ctx, [query], "6903494529735864");
-      const result = await publishLsRequestWithAck({
-        client: ctx.mqttClient,
-        content,
-        requestId: content.request_id,
-        extract: (parsed) => parsed
-      });
-      const out = { messageID, text: text3, success: !result?.error };
+      throw err;
+    };
+    if (!ctx.mqttClient || !ctx.mqttClient.connected) {
+      return fail(new Error("Not connected to MQTT"));
+    }
+    if (!text3 || !messageID) {
+      return fail(new Error("text and messageID are required"));
+    }
+    const query = {
+      failure_count: null,
+      label: "742",
+      payload: JSON.stringify({
+        message_id: messageID,
+        text: text3
+      }),
+      queue_name: "edit_message"
+    };
+    const content = buildWsTaskContent(ctx, [query], "6903494529735864");
+    const promise = publishLsRequestWithAck({
+      client: ctx.mqttClient,
+      content,
+      requestId: content.request_id,
+      extract: (parsed) => parsed
+    }).then((parsed) => {
+      const { body } = extractEditedMessage(parsed);
+      if (body && body !== text3) {
+        const error2 = { error: "The message is too old or not from you!", success: false };
+        if (cb) {
+          cb(error2);
+          return error2;
+        }
+        throw error2;
+      }
+      const out = { messageID, text: text3, success: true };
       if (cb) cb(null, out);
       return out;
-    } catch (err) {
+    }).catch((err) => {
       error("editMessage", err?.error || err?.message || err);
-      if (cb) return cb(err);
+      if (cb) {
+        cb(err);
+        return { error: err?.error || err?.message || String(err), success: false };
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88114,6 +88164,8 @@ function emoji_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88124,7 +88176,7 @@ function emoji_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88142,6 +88194,8 @@ function emoji_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -88323,6 +88377,8 @@ function gcname_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88333,7 +88389,7 @@ function gcname_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88351,6 +88407,8 @@ function gcname_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -88491,28 +88549,41 @@ function gcrule_default(defaultFuncs, api, ctx) {
 
 // src/deltas/apis/messaging/markAsDelivered.ts
 function markAsDelivered_default(defaultFuncs, api, ctx) {
-  return async function markAsDelivered(threadID, messageID) {
-    if (!threadID || !messageID) {
-      const err = "Error: messageID or threadID is not defined";
+  return function markAsDelivered(threadID, messageID, callback) {
+    const cb = typeof callback === "function" ? callback : void 0;
+    const fail = (err) => {
       error("markAsDelivered", err);
-      throw new Error(err);
+      if (cb) {
+        cb(err);
+        return;
+      }
+      throw err;
+    };
+    if (!threadID || !messageID) {
+      return fail("Error: messageID or threadID is not defined");
     }
     const form = {};
     form["message_ids[0]"] = messageID;
     form["thread_ids[" + threadID + "][0]"] = messageID;
-    try {
-      const resData = await defaultFuncs.post(
-        "https://www.facebook.com/ajax/mercury/delivery_receipts.php",
-        ctx.jar,
-        form
-      ).then(saveCookies(ctx.jar)).then(parseAndCheckLogin(ctx, defaultFuncs));
-      if (resData.error) {
-        throw resData;
-      }
-    } catch (err) {
+    const promise = defaultFuncs.post(
+      "https://www.facebook.com/ajax/mercury/delivery_receipts.php",
+      ctx.jar,
+      form
+    ).then(saveCookies(ctx.jar)).then(parseAndCheckLogin(ctx, defaultFuncs)).then((resData) => {
+      if (resData && resData.error) throw resData;
+      if (cb) cb(null, resData);
+      return resData;
+    }).catch((err) => {
       error("markAsDelivered", err);
+      if (cb) {
+        cb(err);
+        return null;
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88600,20 +88671,27 @@ function markAsRead_default(defaultFuncs, api, ctx) {
 
 // src/deltas/apis/messaging/markAsReadAll.ts
 function markAsReadAll_default(defaultFuncs, api, ctx) {
-  return async function markAsReadAll() {
-    try {
-      const resData = await defaultFuncs.post(
-        "https://www.facebook.com/ajax/mercury/mark_folder_as_read.php",
-        ctx.jar,
-        { folder: "inbox" }
-      );
-      const parsedData = await parseAndCheckLogin(ctx, defaultFuncs)(resData);
-      if (parsedData.error) throw parsedData;
-      return;
-    } catch (err) {
+  return function markAsReadAll(callback) {
+    const cb = typeof callback === "function" ? callback : void 0;
+    const promise = defaultFuncs.post(
+      "https://www.facebook.com/ajax/mercury/mark_folder_as_read.php",
+      ctx.jar,
+      { folder: "inbox" }
+    ).then((resData) => parseAndCheckLogin(ctx, defaultFuncs)(resData)).then((parsedData) => {
+      if (parsedData && parsedData.error) throw parsedData;
+      if (cb) cb(null, parsedData);
+      return parsedData;
+    }).catch((err) => {
       error("markAsReadAll", err);
+      if (cb) {
+        cb(err);
+        return null;
+      }
       throw err;
-    }
+    });
+    promise.catch(() => {
+    });
+    return promise;
   };
 }
 
@@ -88641,6 +88719,16 @@ function markAsSeen_default(defaultFuncs, api, ctx) {
         }
         resolveFunc(friendList);
       };
+    } else {
+      const originalCallback = callback;
+      callback = function(err, data2) {
+        try {
+          originalCallback(err, data2);
+        } finally {
+          if (err) resolveFunc(void 0);
+          else resolveFunc(data2);
+        }
+      };
     }
     const form = {
       seen_timestamp
@@ -88692,6 +88780,8 @@ function nickname_default(defaultFuncs, api, ctx) {
       _callback = void 0;
       _initiatorID = void 0;
     }
+    returnPromise.catch(() => {
+    });
     if (!_callback) {
       _callback = function(__err, __data) {
         if (__err) _rejectPromise(__err);
@@ -88702,7 +88792,7 @@ function nickname_default(defaultFuncs, api, ctx) {
       _callback = function(__err, __data) {
         if (__err) {
           originalCallback(__err);
-          _rejectPromise(__err);
+          _resolvePromise(void 0);
         } else {
           originalCallback(null, __data);
           _resolvePromise(__data);
@@ -88721,6 +88811,8 @@ function nickname_default(defaultFuncs, api, ctx) {
     if (!ctx.mqttClient) {
       return _callback(new Error("Not connected to MQTT"));
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     ctx.wsTaskNumber += 1;
     const queryPayload = {
@@ -89297,8 +89389,9 @@ var sendMessage_default = (defaultFuncs, api, ctx) => {
 
 // src/deltas/apis/messaging/sendTypingIndicator.ts
 function sendTypingIndicator_default(defaultFuncs, api, ctx) {
-  return async function sendTypingIndicatorV2(sendTyping, threadID, options, callback) {
+  return function sendTypingIndicatorV2(sendTyping, threadID, options, callback) {
     if (typeof options === "function") {
+      callback = options;
       options = {};
     }
     options = options || {};
@@ -89311,14 +89404,23 @@ function sendTypingIndicator_default(defaultFuncs, api, ctx) {
       actualSendTyping = sendTyping;
       actualThreadID = threadID;
     }
+    const fail = (message) => {
+      const err = new Error(message);
+      if (typeof callback === "function") {
+        callback(err);
+        return Promise.resolve(null);
+      }
+      return Promise.reject(err);
+    };
     if (!actualThreadID) {
-      throw new Error("sendTypingIndicator: threadID is required");
+      return fail("sendTypingIndicator: threadID is required");
     }
     if (!ctx.mqttClient || !ctx.mqttClient.connected) {
-      throw new Error("sendTypingIndicator: not connected to MQTT");
+      return fail("sendTypingIndicator: not connected to MQTT");
     }
     const threadIDs = Array.isArray(actualThreadID) ? actualThreadID : [actualThreadID];
     const attribution = options.type || 0;
+    const publishPromises = [];
     const publishTyping = (tid, isTyping) => {
       ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
       const isGroupThread = String(tid).length >= 16 ? 1 : 0;
@@ -89348,18 +89450,26 @@ function sendTypingIndicator_default(defaultFuncs, api, ctx) {
         );
       });
     };
-    await Promise.all(threadIDs.map((tid) => publishTyping(tid, actualSendTyping)));
     const duration = options.duration || 1e4;
     const autoStop = options.autoStop !== false;
-    if (actualSendTyping && autoStop) {
-      threadIDs.forEach((tid) => {
-        setTimeout(() => {
-          publishTyping(tid, false).catch(() => {
-          });
-        }, duration);
+    threadIDs.forEach((tid) => {
+      const p = publishTyping(tid, actualSendTyping).then(() => {
+        if (actualSendTyping && autoStop) {
+          setTimeout(() => {
+            publishTyping(tid, false).catch(() => {
+            });
+          }, duration);
+        }
+        return true;
       });
+      publishPromises.push(p);
+    });
+    const result = Promise.all(publishPromises).then(() => true);
+    if (typeof callback === "function") {
+      result.then(() => callback(null, true)).catch((err) => callback(err));
+      return result.catch(() => null);
     }
-    return true;
+    return result;
   };
 }
 
@@ -89748,6 +89858,8 @@ function theme_default(defaultFuncs, api, ctx) {
       let currentEpochId = parseInt(generateOfflineThreadingID());
       const createAndPublish = (label, queueName, payload) => {
         currentEpochId = parseInt(generateOfflineThreadingID());
+        if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+        if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
         ctx.wsReqNumber += 1;
         ctx.wsTaskNumber += 1;
         const request_id = ctx.wsReqNumber;
@@ -89854,6 +89966,8 @@ function setThreadTheme_default(defaultFuncs, _api, ctx) {
       }
       throw error2;
     }
+    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
     ctx.wsReqNumber += 1;
     let baseTaskNumber = ++ctx.wsTaskNumber;
     const makeTask = (label, queueName, extraPayload = {}) => ({
@@ -89875,6 +89989,7 @@ function setThreadTheme_default(defaultFuncs, _api, ctx) {
       { label: 43, queue: "thread_theme", extra: { source: null, payload: null } }
     ];
     const messages = definitions.map(({ label, queue, extra }) => {
+      if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
       ctx.wsReqNumber += 1;
       return {
         app_id: "2220391788200892",
@@ -90025,15 +90140,8 @@ async function publishThreadTask(ctx, label, queueName, payload, versionId, appI
     requestId: content.request_id,
     extract: (parsed) => {
       const body = parsed && parsed.payload;
-      const error2 = body && (body.error || body.errorDescription);
-      if (error2) {
-        const err = new Error(
-          typeof error2 === "string" ? error2 : error2.message || "MQTT task was rejected"
-        );
-        err.error = error2;
-        throw err;
-      }
-      return body || { success: true };
+      if (!body || typeof body !== "object") return { success: true };
+      return body;
     }
   });
 }
@@ -90064,8 +90172,13 @@ function unsendMessage_default(defaultFuncs, _api, ctx) {
       _resolve = resolve;
       _reject = reject;
     });
+    returnPromise.catch(() => {
+    });
     const done = (err, data2) => {
-      if (cb) cb(err, data2);
+      if (cb) {
+        cb(err, data2);
+        return;
+      }
       if (err) _reject(err);
       else _resolve(data2);
     };
@@ -90833,6 +90946,7 @@ function pinMessage_default(defaultFuncs, api, ctx) {
 }
 
 // src/deltas/apis/mqtt/sendMessageMqtt.ts
+var DEFAULT_RETRY_DELAYS_MS = [900, 1600, 2400, 3500, 5e3, 7e3];
 function preUploadedId(item) {
   if (typeof item === "number" && Number.isFinite(item)) return String(item);
   if (typeof item === "string" && /^\d{6,}$/.test(item.trim())) return item.trim();
@@ -90981,7 +91095,7 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
         attachmentIds = ids;
       } catch (err) {
         error("Attachment upload failed:", err);
-        callback(err);
+        finish(err);
         return done();
       }
     }
@@ -91062,6 +91176,7 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
         let threadIDFromAck = null;
         let failure = null;
         let serverError = null;
+        let softFailure = null;
         const steps = parsed.payload?.step;
         const visit = (node) => {
           if (!Array.isArray(node)) return;
@@ -91073,12 +91188,10 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
               threadIDFromAck = String(node[2][1]);
             }
             if (node[1] === "markOptimisticMessageFailed") {
-              const detail = typeof node[3] === "string" ? node[3] : "Message failed on server.";
-              failure = { error: detail, errorDescription: "Message failed on server." };
+              softFailure = typeof node[3] === "string" ? node[3] : "Message failed on server.";
             }
             if (node[1] === "updateSubscriptErrorMessage" || node[1] === "fatalError") {
-              const detail = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
-              serverError = detail;
+              softFailure = typeof node[3] === "string" ? node[3] : typeof node[4] === "string" ? node[4] : "Couldn't send.";
             }
           }
           for (const child of node) visit(child);
@@ -91088,7 +91201,8 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
           messageID: resolvedMessageID,
           threadID: threadIDFromAck,
           failure,
-          serverError
+          serverError,
+          softFailure
         });
       };
       if (mqttClient && typeof mqttClient.on === "function") {
@@ -91099,14 +91213,21 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       });
       timer = setTimeout(() => settle2({ timeout: true }), 15e3);
     });
+    const retryDelays = (() => {
+      const override = ctx.globalOptions && ctx.globalOptions.mqttSendRetryDelaysMs;
+      return Array.isArray(override) && override.length ? override : DEFAULT_RETRY_DELAYS_MS;
+    })();
     let result = null;
     let lastOtid = "";
-    for (let attempt = 0; attempt < 3; attempt++) {
+    for (let attempt = 0; attempt <= retryDelays.length; 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 && !result.softFailure) break;
+      if ((result.failure || result.serverError) && attempt >= 2) break;
+      if (attempt < retryDelays.length) {
+        await sleep(retryDelays[attempt] + Math.floor(Math.random() * 400));
+      }
     }
     if (result.failure || result.serverError) {
       const err = result.failure || { error: result.serverError };
@@ -91119,6 +91240,21 @@ var sendMessageMqtt_default = (defaultFuncs, api, ctx) => {
       finish(err);
       return done();
     }
+    if (result.softFailure) {
+      warn(
+        "sendMessageMqtt [MQTT]",
+        `Facebook rejected the message (${result.softFailure}); thread ${threadID}. Retried ${retryDelays.length} times without success; continuing without failing the bot.`
+      );
+      finish(null, {
+        threadID: result.threadID || threadID.toString(),
+        messageID: result.messageID || null,
+        timestamp,
+        type: replyToMessage ? "message_reply" : "message",
+        error: result.softFailure,
+        success: false
+      });
+      return done();
+    }
     finish(null, {
       threadID: result.threadID || threadID.toString(),
       messageID: result.messageID || `mid.${lastOtid}`,
@@ -92888,8 +93024,13 @@ function createPoll_default(_defaultFuncs, _api, ctx) {
       _resolve = resolve;
       _reject = reject;
     });
+    promise.catch(() => {
+    });
     const done = (err, data2) => {
-      if (cb) cb(err, data2);
+      if (cb) {
+        cb(err, data2);
+        return;
+      }
       if (err) _reject(err);
       else _resolve(data2);
     };
@@ -93749,7 +93890,7 @@ function parseDelta(defaultFuncs, api, ctx, globalCallback, v) {
   if (v.delta.class == "NewMessage") {
     if (ctx.globalOptions.pageID && ctx.globalOptions.pageID != v.queue) return;
     (function resolveAttachmentUrl(i2) {
-      if (v.delta.attachments && i2 == v.delta.attachments.length) {
+      if (!v.delta.attachments || !Array.isArray(v.delta.attachments) || i2 >= v.delta.attachments.length) {
         let fmtMsg;
         try {
           fmtMsg = formatDeltaMessage(v);
@@ -93940,11 +94081,11 @@ function installTeardownGuard() {
   const isTeardownNoise = (err) => !!err && (err.code === "MQTT_CONNECTION_CLOSED" || /Connection closed|client disconnecting/i.test(String(err && err.message ? err.message : err))) && !/error_gc|1357001|checkpoint/i.test(String(err && err.message ? err.message : err));
   process.on("uncaughtException", (err) => {
     if (isTeardownNoise(err)) return;
-    throw err;
+    error("uncaughtException", err);
   });
   process.on("unhandledRejection", (reason) => {
     if (isTeardownNoise(reason)) return;
-    throw reason;
+    error("unhandledRejection", reason);
   });
 }
 var MQTT_TOPICS = [
@@ -94930,13 +95071,18 @@ async function login(credentials, options, callback) {
     const finish = (error2, loginApi) => {
       if (settled) return;
       settled = true;
+      const hasCallback = typeof callback === "function";
       try {
         callback?.(error2 || null, loginApi);
       } catch (callbackError) {
         error("login callback", callbackError);
       }
-      if (error2) reject(error2);
-      else resolve(loginApi);
+      if (error2) {
+        if (hasCallback) resolve(loginApi);
+        else reject(error2);
+      } else {
+        resolve(loginApi);
+      }
     };
     loginHelper(
       credentials,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "6.0.6",
+  "version": "6.0.8",
   "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 && node test/send-failure.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 && node test/crash-safety.test.cjs",
     "audit": "npm audit",
     "audit:fix": "npm audit fix"
   },