@lazyneoaz/metachat 1.1.3 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazyneoaz/metachat",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "type": "commonjs",
   "types": "src/types/index.d.ts",
   "description": "Advanced Facebook Chat API client for building Messenger bots — real-time messaging, thread management, MQTT, and session stability.",
@@ -37,7 +37,6 @@
     "metachat"
   ],
   "dependencies": {
-    "@dongdev/fca-unofficial": "^4.0.3",
     "axios": "^1.13.5",
     "axios-cookiejar-support": "^4.0.7",
     "bluebird": "^3.7.2",

package/src/apis/changeAdminStatus.js

@@ -67,7 +67,7 @@ module.exports = function (defaultFuncs, api, ctx) {
             });
 
             const form = JSON.stringify({
-                app_id: "2220391788200892",
+                app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
                 payload: JSON.stringify({
                     epoch_id: epochID,
                     tasks: tasks,
@@ -114,7 +114,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                     epoch_id: epochID,
                     data_trace_id: null
                 }),
-                app_id: "2220391788200892"
+                app_id: String(ctx.appID || ctx.mqttAppID || "772021112871879")
             };
 
             defaultFuncs

package/src/apis/changeGroupImage.js

@@ -110,7 +110,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       };
 
       const request = {
-        app_id: "2220391788200892",
+        app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
         payload: JSON.stringify(mqttPayload),
         request_id: reqID,
         type: 3

package/src/apis/createPoll.js

@@ -58,7 +58,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       };
 
       const form = JSON.stringify({
-        app_id: "2220391788200892",
+        app_id: "772021112871879",
         payload: JSON.stringify(payload),
         request_id: ++ctx.wsReqNumber,
         type: 3

package/src/apis/deleteMessage.js

@@ -1,20 +1,9 @@
 "use strict";
 
 const utils = require('../utils');
-const { publishLsRequestWithAck } = require('../utils/lsRequest');
 
 module.exports = (defaultFuncs, api, ctx) => {
-  /**
-   * Deletes one or more messages.
-   *
-   * Uses MQTT label "146" (version "25909428212080747") when the MQTT client is
-   * connected — this matches dongdev's deleteMessage implementation.
-   * Falls back to the legacy HTTP delete_messages.php endpoint otherwise.
-   *
-   * @param {string|string[]} messageOrMessages
-   * @param {Function} [callback]
-   */
-  return async function deleteMessage(messageOrMessages, callback) {
+  return async function deleteMessage(messageID, callback) {
     let resolveFunc = () => {};
     let rejectFunc = () => {};
     const returnPromise = new Promise((resolve, reject) => {
@@ -37,66 +26,17 @@ module.exports = (defaultFuncs, api, ctx) => {
     }
 
     try {
-      const messages = Array.isArray(messageOrMessages)
-        ? messageOrMessages
-        : [messageOrMessages];
-
-      if (messages.length === 0 || messages.some(v => v === null || v === undefined || v === "")) {
-        throw new Error("messageOrMessages must contain at least one non-empty message ID");
-      }
-
-      const mqttReady = !!(ctx.mqttClient && ctx.mqttClient.connected);
-
-      if (mqttReady) {
-        // MQTT path: label "146", version "25909428212080747" (dongdev confirmed)
-        if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
-        if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
-
-        const requestId = ++ctx.wsReqNumber;
-        const tasks = messages.map((messageID) => {
-          const queueName = String(messageID);
-          const taskId = ++ctx.wsTaskNumber;
-          return {
-            failure_count: null,
-            label: "146",
-            payload: JSON.stringify({
-              thread_key: queueName,
-              remove_type: 0,
-              sync_group: 1
-            }),
-            queue_name: queueName,
-            task_id: taskId
-          };
-        });
-
-        publishLsRequestWithAck({
-          client: ctx.mqttClient,
-          requestId,
-          timeoutMs: 20000,
-          content: {
-            app_id: "2220391788200892",
-            payload: JSON.stringify({
-              epoch_id: parseInt(utils.generateOfflineThreadingID()),
-              tasks,
-              version_id: "25909428212080747"
-            }),
-            request_id: requestId,
-            type: 3
-          },
-          extract: (message) => ({ success: true, response: message.payload })
-        }).then((result) => {
-          callback(null, result);
-        }).catch((mqttErr) => {
-          utils.error("deleteMessage/mqtt", mqttErr);
-          // MQTT failed → fall back to HTTP
-          _deleteViaHttp(messages, callback, defaultFuncs, ctx);
-        });
+      const res = await defaultFuncs.post(
+        "https://www.facebook.com/ajax/mercury/delete_messages.php",
+        ctx.jar,
+        { message_id: messageID }
+      ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
-      } else {
-        // HTTP fallback
-        await _deleteViaHttp(messages, callback, defaultFuncs, ctx);
+      if (res && res.error) {
+        throw new Error(String(res.error_msg || res.error || "deleteMessage failed"));
       }
 
+      callback(null, { success: true });
     } catch (err) {
       utils.error("deleteMessage", err);
       callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
@@ -105,24 +45,3 @@ module.exports = (defaultFuncs, api, ctx) => {
     return returnPromise;
   };
 };
-
-async function _deleteViaHttp(messages, callback, defaultFuncs, ctx) {
-  try {
-    // The legacy endpoint only accepts one messageID at a time
-    for (const messageID of messages) {
-      const res = await defaultFuncs.post(
-        "https://www.facebook.com/ajax/mercury/delete_messages.php",
-        ctx.jar,
-        { message_id: messageID }
-      ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
-
-      if (res && res.error) {
-        throw new Error(String(res.error_msg || res.error || "deleteMessage HTTP failed"));
-      }
-    }
-    callback(null, { success: true });
-  } catch (err) {
-    utils.error("deleteMessage/http", err);
-    callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
-  }
-}

package/src/apis/emoji.js

@@ -92,11 +92,11 @@ module.exports = function (defaultFuncs, api, ctx) {
     };
 
     const context = {
-      app_id: '2220391788200892',
+      app_id: ctx.appID || '2220391788200892',
       payload: {
         epoch_id: parseInt(utils.generateOfflineThreadingID()),
         tasks: [query],
-        version_id: '8798795233522156',
+        version_id: '24631415369801570',
       },
       request_id: ctx.wsReqNumber,
       type: 3,

package/src/apis/gcmember.js

@@ -1,172 +1,128 @@
 "use strict";
 
 const utils = require('../utils');
-const { publishLsRequestWithAck } = require('../utils/lsRequest');
 
 module.exports = function (defaultFuncs, api, ctx) {
   /**
-   * Adds or removes members from a group chat.
+   * Made by ChoruOfficial 
+   * Mqtt
+   * Adds or removes members from a group chat with pre-checking.
    *
-   * Add  uses publishLsRequestWithAck (label "23", app_id "772021112871879",
-   *          version "24502707779384158") — matches dongdev addUserToGroup.
-   * Remove uses fire-and-forget publish     (label "140", app_id "2220391788200892",
-   *          version "25002366262773827")   — matches dongdev removeUserFromGroup.
-   *
-   * @param {"add"|"remove"} action
-   * @param {string|string[]} userIDs
-   * @param {string} threadID
-   * @param {Function} [callback]
+   * @param {"add" | "remove"} action The action to perform.
+   * @param {string|string[]} userIDs The user ID or array of user IDs.
+   * @param {string} threadID The ID of the group chat.
+   * @param {Function} [callback] Optional callback function.
+   * @returns {Promise<object>} A promise that resolves with information about the action.
    */
   return async function gcmember(action, userIDs, threadID, callback) {
     let _callback;
     if (typeof threadID === 'function') {
-      _callback = threadID;
-      threadID = null;
+        _callback = threadID;
+        threadID = null;
     } else if (typeof callback === 'function') {
-      _callback = callback;
+        _callback = callback;
     }
-
+    
     let resolvePromise, rejectPromise;
     const returnPromise = new Promise((resolve, reject) => {
-      resolvePromise = resolve;
-      rejectPromise = reject;
+        resolvePromise = resolve;
+        rejectPromise = reject;
     });
 
-    if (typeof _callback !== "function") {
+    if (typeof _callback != "function") {
       _callback = (err, data) => {
+        // Note: We will now rarely use the 'err' parameter for validation errors
         if (err) return rejectPromise(err);
         resolvePromise(data);
-      };
+      }
     }
 
     try {
-      const validActions = ["add", "remove"];
-      action = action ? action.toLowerCase() : "";
-
-      if (!validActions.includes(action)) {
-        _callback(null, { type: "error_gc", error: `Invalid action. Must be one of: ${validActions.join(", ")}` });
-        return returnPromise;
-      }
-      if (!userIDs || (Array.isArray(userIDs) ? userIDs.length === 0 : false)) {
-        _callback(null, { type: "error_gc", error: "userIDs is required." });
-        return returnPromise;
-      }
-      if (!threadID) {
-        _callback(null, { type: "error_gc", error: "threadID is required." });
-        return returnPromise;
-      }
-      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
-        _callback(null, { type: "error_gc", error: "Not connected to MQTT" });
-        return returnPromise;
-      }
-
-      const threadInfo = await api.getThreadInfo(threadID);
-      if (!threadInfo) {
-        _callback(null, { type: "error_gc", error: "Could not retrieve thread information." });
-        return returnPromise;
-      }
-      if (threadInfo.isGroup === false) {
-        _callback(null, { type: "error_gc", error: "This feature is only for group chats, not private messages." });
-        return returnPromise;
-      }
-
-      const currentMembers = threadInfo.participantIDs || [];
-      const usersToModify = Array.isArray(userIDs) ? userIDs : [userIDs];
+        const validActions = ["add", "remove"];
+        action = action ? action.toLowerCase() : "";
 
-      if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
-      if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
 
-      if (action === 'add') {
-        // Filter out users already in the group
-        const usersToAdd = usersToModify.filter(id => !currentMembers.includes(String(id)));
-        if (usersToAdd.length === 0) {
-          _callback(null, { type: "error_gc", error: "All specified users are already in the group." });
-          return returnPromise;
+        if (!validActions.includes(action)) {
+            _callback(null, { type: "error_gc", error: `Invalid action. Must be one of: ${validActions.join(", ")}` });
+            return returnPromise;
+        }
+        if (!userIDs || userIDs.length === 0) {
+            _callback(null, { type: "error_gc", error: "userIDs is required." });
+            return returnPromise;
+        }
+        if (!threadID) {
+            _callback(null, { type: "error_gc", error: "threadID is required." });
+            return returnPromise;
+        }
+        if (!ctx.mqttClient || !ctx.mqttClient.connected) {
+            _callback(null, { type: "error_gc", error: "Not connected to MQTT" });
+            return returnPromise;
         }
 
-        const requestId = ++ctx.wsReqNumber;
-        const taskId = ++ctx.wsTaskNumber;
-
-        // addUserToGroup: app_id "772021112871879", version "24502707779384158" (dongdev confirmed)
-        publishLsRequestWithAck({
-          client: ctx.mqttClient,
-          requestId,
-          content: {
-            app_id: "772021112871879",
-            payload: JSON.stringify({
-              epoch_id: parseInt(utils.generateOfflineThreadingID()),
-              tasks: [{
-                failure_count: null,
-                label: "23",
-                payload: JSON.stringify({
-                  thread_key: threadID,
-                  contact_ids: usersToAdd.map(id => String(id)),
-                  sync_group: 1
-                }),
-                queue_name: String(threadID),
-                task_id: taskId
-              }],
-              version_id: "24502707779384158"
-            }),
-            request_id: requestId,
-            type: 3
-          },
-          extract: (message) => ({ success: true, response: message.payload })
-        }).then((result) => {
-          _callback(null, {
-            type: "gc_member_update",
-            threadID, userIDs: usersToAdd, action,
-            senderID: ctx.userID, BotID: ctx.userID, timestamp: Date.now()
-          });
-        }).catch((err) => {
-          utils.error("gcmember/add", err);
-          _callback(err instanceof Error ? err : new Error(err.message || "gcmember add failed"));
-        });
-
-      } else {
-        // action === 'remove'
-        const userToRemove = String(usersToModify[0]);
-        if (!currentMembers.includes(userToRemove)) {
-          _callback(null, { type: "error_gc", error: `User ${userToRemove} is not in this group.` });
-          return returnPromise;
+        const threadInfo = await api.getThreadInfo(threadID);
+        if (!threadInfo) {
+            _callback(null, { type: "error_gc", error: "Could not retrieve thread information." });
+            return returnPromise;
+        }
+        if (threadInfo.isGroup === false) {
+            _callback(null, { type: "error_gc", error: "This feature is only for group chats, not private messages." });
+            return returnPromise;
+        }
+        
+        const currentMembers = threadInfo.participantIDs;
+        const usersToModify = Array.isArray(userIDs) ? userIDs : [userIDs];
+        let queryPayload, query;
+        let finalUsers = usersToModify;
+        
+        ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
+        ctx.wsTaskNumber = (ctx.wsTaskNumber || 0) + 1;
+
+        if (action === 'add') {
+            const usersToAdd = usersToModify.filter(id => !currentMembers.includes(id));
+            if (usersToAdd.length === 0) {
+                _callback(null, { type: "error_gc", error: "All specified users are already in the group." });
+                return returnPromise;
+            }
+            finalUsers = usersToAdd;
+            queryPayload = { thread_key: parseInt(threadID), contact_ids: finalUsers.map(id => parseInt(id)), sync_group: 1 };
+            query = { label: "23", payload: JSON.stringify(queryPayload), queue_name: threadID, task_id: ctx.wsTaskNumber };
+        
+        } else { // action is 'remove'
+            const userToRemove = usersToModify[0];
+            if (!currentMembers.includes(userToRemove)) {
+                _callback(null, { type: "error_gc", error: `User with ID ${userToRemove} is not in this group chat.` });
+                return returnPromise;
+            }
+            finalUsers = [userToRemove];
+            queryPayload = { thread_id: threadID, contact_id: userToRemove, sync_group: 1 };
+            query = { label: "140", payload: JSON.stringify(queryPayload), queue_name: "remove_participant_v2", task_id: ctx.wsTaskNumber };
         }
 
-        // removeUserFromGroup: app_id "2220391788200892", version "25002366262773827" (dongdev confirmed)
-        // Fire-and-forget (no ACK needed) — matches dongdev's publishRealtimeMessage pattern
         const context = {
-          app_id: "2220391788200892",
-          payload: JSON.stringify({
-            epoch_id: parseInt(utils.generateOfflineThreadingID()),
-            tasks: [{
-              failure_count: null,
-              label: "140",
-              payload: JSON.stringify({
-                thread_id: threadID,
-                contact_id: userToRemove,
-                sync_group: 1
-              }),
-              queue_name: "remove_participant_v2",
-              task_id: Math.floor(Math.random() * 1001)
-            }],
-            version_id: "25002366262773827"
-          }),
-          request_id: ++ctx.wsReqNumber,
+          app_id: ctx.appID || '2220391788200892',
+          payload: { epoch_id: parseInt(utils.generateOfflineThreadingID()), tasks: [query], version_id: "24631415369801570" },
+          request_id: ctx.wsReqNumber,
           type: 3
         };
+        context.payload = JSON.stringify(context.payload);
 
         ctx.mqttClient.publish('/ls_req', JSON.stringify(context), { qos: 1, retain: false }, (err) => {
           if (err) return _callback(err);
-          return _callback(null, {
+          
+          const gcmemberInfo = {
             type: "gc_member_update",
-            threadID, userIDs: [userToRemove], action,
-            senderID: ctx.userID, BotID: ctx.userID, timestamp: Date.now()
-          });
+            threadID: threadID,
+            userIDs: finalUsers,
+            action: action,
+            senderID: ctx.userID,
+            BotID: ctx.userID,
+            timestamp: Date.now(),
+          };
+          return _callback(null, gcmemberInfo);
         });
-      }
-
     } catch (err) {
-      utils.error("gcmember", err);
-      _callback(err instanceof Error ? err : new Error(err.message || "An unknown error occurred."));
+        utils.error("gcmember", err);
+        _callback(err instanceof Error ? err : new Error(err.message || "An unknown error occurred."));
     }
 
     return returnPromise;

package/src/apis/gcname.js

@@ -91,7 +91,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     };
 
     const context = {
-      app_id: '2220391788200892',
+      app_id: ctx.appID || '2220391788200892',
       payload: {
         epoch_id: parseInt(utils.generateOfflineThreadingID()),
         tasks: [query],

package/src/apis/gcrule.js

@@ -74,33 +74,36 @@ module.exports = function (defaultFuncs, api, ctx) {
         }
 
         const isAdminStatus = action === 'admin' ? 1 : 0;
-        if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+        ctx.wsReqNumber = (ctx.wsReqNumber || 0) + 1;
+        ctx.wsTaskNumber = (ctx.wsTaskNumber || 0) + 1;
 
-        // Dongdev pattern: task_id starts at 1 (index + 1), fire-and-forget publish
+        const queryPayload = {
+            thread_key: parseInt(threadID),
+            contact_id: parseInt(userID),
+            is_admin: isAdminStatus
+        };
+        const query = {
+            failure_count: null,
+            label: "25",
+            payload: JSON.stringify(queryPayload),
+            queue_name: "admin_status",
+            task_id: ctx.wsTaskNumber
+        };
         const context = {
-            app_id: '2220391788200892',
-            payload: JSON.stringify({
+            app_id: ctx.appID || '2220391788200892',
+            payload: {
                 epoch_id: parseInt(utils.generateOfflineThreadingID()),
-                tasks: [{
-                    failure_count: null,
-                    label: "25",
-                    payload: JSON.stringify({
-                        thread_key: threadID,
-                        contact_id: userID,
-                        is_admin: isAdminStatus
-                    }),
-                    queue_name: "admin_status",
-                    task_id: 1
-                }],
-                version_id: "8798795233522156"
-            }),
-            request_id: ++ctx.wsReqNumber,
+                tasks: [query],
+                version_id: "24631415369801570"
+            },
+            request_id: ctx.wsReqNumber,
             type: 3
         };
+        context.payload = JSON.stringify(context.payload);
 
         ctx.mqttClient.publish('/ls_req', JSON.stringify(context), { qos: 1, retain: false }, (err) => {
             if (err) return _callback(err);
-            return _callback(null, {
+            const gcruleInfo = {
                 type: "gc_rule_update",
                 threadID: threadID,
                 userID: userID,
@@ -108,7 +111,8 @@ module.exports = function (defaultFuncs, api, ctx) {
                 senderID: ctx.userID,
                 BotID: ctx.userID,
                 timestamp: Date.now(),
-            });
+            };
+            return _callback(null, gcruleInfo);
         });
 
     } catch (err) {

package/src/apis/listenMqtt.js

@@ -107,12 +107,6 @@ async function listenMqtt(defaultFuncs, api, ctx, globalCallback, scheduleReconn
     const sessionID = Math.floor(Math.random() * Number.MAX_SAFE_INTEGER) + 1;
     const cid = ctx.clientID;
     const cachedUA = ctx.globalOptions.cachedUserAgent || ctx.globalOptions.userAgent;
-    // Use app_id from Facebook's own page data (populated by buildAPI) when
-    // available. Hard-coded fallback is the Messenger web app ID.
-    const rawAppId = ctx.appID || ctx.mqttAppID || ctx.userAppID;
-    // Coerce to number safely — Number() of a non-numeric string yields NaN which
-    // serialises as null in JSON and breaks the MQTT CONNECT packet.
-    const mqttAid = rawAppId && !isNaN(Number(rawAppId)) ? Number(rawAppId) : 219994525426954;
     const username = {
         u: ctx.userID,
         s: sessionID,
@@ -120,7 +114,7 @@ async function listenMqtt(defaultFuncs, api, ctx, globalCallback, scheduleReconn
         fg: false,
         d: cid,
         ct: 'websocket',
-        aid: mqttAid,
+        aid: 219994525426954,
         aids: null,
         mqtt_sid: '',
         cp: 3,

package/src/apis/nickname.js

@@ -94,7 +94,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     });
 
     const envelope = {
-      app_id: "2220391788200892",
+      app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
       payload: JSON.stringify({
         epoch_id: generateEpochId(),
         tasks: [task],

package/src/apis/pinMessage.js

@@ -54,7 +54,7 @@ module.exports = function (defaultFuncs, api, ctx) {
 
       const epoch_id = parseInt(utils.generateOfflineThreadingID());
       const version_id = "9523201934447612";
-      const app_id = "2220391788200892";
+      const app_id = String(ctx.appID || ctx.mqttAppID || "2220391788200892");
 
       const createMqttRequest = (tasks, increment = 0) => ({
         app_id,

package/src/apis/sendMessage.js

@@ -166,7 +166,7 @@ module.exports = (defaultFuncs, api, ctx) => {
         const mention = msg.mentions[i];
         const tag = mention.tag;
         if (typeof tag !== "string") throw new Error("Mention tags must be strings.");
-        const offset = (msg.body || "").indexOf(tag, mention.fromIndex || 0);
+        const offset = msg.body.indexOf(tag, mention.fromIndex || 0);
         if (offset < 0) utils.warn("handleMention", 'Mention for "' + tag + '" not found in message string.');
         const id = mention.id || 0;
         const emptyChar = '\u200E';
@@ -285,84 +285,77 @@ module.exports = (defaultFuncs, api, ctx) => {
       return callback(new Error("Dissallowed props: `" + disallowedProperties.join(", ") + "`"));
     }
 
+    // Declare typing state here so the finally block never hits a ReferenceError
+    // in strict mode. These are set below if simulateTyping is enabled.
+    let typingTimeout = null;
+    let typingStarted = false;
+
     try {
-      // Apply anti-suspension delay and volume checks for ALL send paths
-      // (both MQTT and HTTP). This must run before transport selection so the
-      // circuit-breaker can block sends on either path.
-      try {
-        await globalAntiSuspension.prepareBeforeMessage(
-          Array.isArray(threadID) ? threadID[0] : threadID,
-          typeof msg === "string" ? msg : (msg.body || "")
-        );
-      } catch (suspensionErr) {
-        // Surface circuit-breaker and volume-limit errors directly to the caller
-        // instead of silently swallowing them. Bots MUST handle these to avoid
-        // triggering Facebook's automated-behavior detection.
-        return callback(suspensionErr);
+      // Simulate human typing delay when the option is enabled and there is
+      // text to type. The indicator is sent first, we wait the computed delay,
+      // then the actual send follows. The finally block stops the indicator.
+      if (ctx.globalOptions.simulateTyping && msg.body && typeof api.sendTypingIndicator === 'function') {
+        try {
+          const typingDelay = await globalAntiSuspension.simulateTyping(threadID, msg.body.length);
+          await api.sendTypingIndicator(true, threadID);
+          typingStarted = true;
+          await new Promise(resolve => {
+            typingTimeout = setTimeout(resolve, typingDelay);
+          });
+        } catch (_) {
+          // Typing simulation is best-effort — a failure here must never
+          // block the actual message send.
+        }
       }
 
-      const mqttReady = !!(ctx.mqttClient && ctx.mqttClient.connected);
-      const isMultiRecipient = Array.isArray(threadID);
-      // Primary transport: MQTT when connected (faster, lower overhead).
-      // Multi-recipient sends always use HTTP (MQTT only handles single thread).
-      const preferMqtt = mqttReady && !isMultiRecipient && !!api.sendMessageMqtt;
-
-      let result;
-      let primaryErr;
-      let primaryOk = false;
-
       try {
-        if (preferMqtt) {
+        const mqttReady = ctx.mqttClient && ctx.mqttClient.connected;
+        const isMultiRecipient = Array.isArray(threadID);
+        // Track which transport was used so the catch block can fall back to
+        // the OTHER transport — retrying the same one that just failed is useless.
+        const usedMqtt = mqttReady && !isMultiRecipient && api.sendMessageMqtt;
+
+        let result;
+        if (usedMqtt) {
           result = await api.sendMessageMqtt(msg, threadID, replyToMessage);
         } else {
           result = await sendViaHttp(msg, threadID, replyToMessage, isGroup);
         }
-        primaryOk = true;
-      } catch (err) {
-        primaryErr = err;
-      }
-
-      if (primaryOk) {
-        return callback(null, result);
-      }
+        callback(null, result);
+      } catch (sendErr) {
+        // Fall back to the OTHER transport, not the one that just failed.
+        const mqttNowReady = ctx.mqttClient && ctx.mqttClient.connected;
+        const primaryWasMqtt = mqttNowReady && !Array.isArray(threadID) && api.sendMessageMqtt;
 
-      // Primary transport failed — fall back to the OTHER transport.
-      let fallbackOk = false;
-      let fallbackErr;
-
-      if (preferMqtt) {
-        // MQTT was primary → fall back to HTTP
-        try {
-          result = await sendViaHttp(msg, threadID, replyToMessage, isGroup);
-          fallbackOk = true;
-        } catch (e) {
-          fallbackErr = e;
-        }
-      } else {
-        // HTTP was primary → fall back to MQTT if available
-        const mqttNow = !!(ctx.mqttClient && ctx.mqttClient.connected);
-        if (mqttNow && !isMultiRecipient && api.sendMessageMqtt) {
+        if (primaryWasMqtt) {
+          // MQTT was used (or is available) — fall back to HTTP
           try {
-            result = await api.sendMessageMqtt(msg, threadID, replyToMessage);
-            fallbackOk = true;
-          } catch (e) {
-            fallbackErr = e;
+            const httpRes = await sendViaHttp(msg, threadID, replyToMessage, isGroup);
+            callback(null, httpRes);
+          } catch (_httpErr) {
+            callback(sendErr);
           }
         } else {
-          fallbackErr = primaryErr;
+          // HTTP was used — try MQTT if it has since become available
+          if (mqttNowReady && !Array.isArray(threadID) && api.sendMessageMqtt) {
+            try {
+              const mqttRes = await api.sendMessageMqtt(msg, threadID, replyToMessage);
+              callback(null, mqttRes);
+            } catch (_mqttErr) {
+              callback(sendErr);
+            }
+          } else {
+            callback(sendErr);
+          }
         }
-      }
-
-      if (fallbackOk) {
-        return callback(null, result);
-      } else {
-        // Both transports failed — report the primary error (most informative)
-        // with the fallback error attached for diagnostics.
-        const err = primaryErr;
-        if (err && fallbackErr && fallbackErr !== primaryErr) {
-          err.fallbackError = fallbackErr;
+      } finally {
+        // Stop typing indicator regardless of success or failure.
+        // typingTimeout and typingStarted are always declared above so this
+        // block can never throw a ReferenceError in strict mode.
+        if (typingTimeout) clearTimeout(typingTimeout);
+        if (typingStarted) {
+          try { await api.sendTypingIndicator(false, threadID); } catch (_) {}
         }
-        return callback(err || fallbackErr);
       }
     } catch (err) {
       callback(err);

package/src/apis/sendMessageMqtt.js

@@ -142,22 +142,10 @@ module.exports = (defaultFuncs, api, ctx) => {
       replyToMessage = null;
     }
 
-    // Anti-suspension preparation (circuit-breaker check, smart delay, thread
-    // throttling, and daily-stat tracking) is the responsibility of the CALLER.
-    // When invoked through api.sendMessage(), preparation is already done there
-    // for ALL transport paths (both MQTT and HTTP).
-    //
-    // If you call api.sendMessageMqtt() directly (bypassing api.sendMessage()),
-    // call globalAntiSuspension.prepareBeforeMessage() yourself first and handle
-    // the circuit-breaker error it may throw — otherwise your bot has no protection.
-
     const normalized = typeof msg === "string" ? { body: msg } : msg;
     const baseBody = normalized.body != null ? String(normalized.body) : "";
     const epoch = (BigInt(Date.now()) << 22n).toString();
-    // Use monotonic ctx.wsReqNumber so concurrent sends never share the same
-    // request_id, which would cause the ACK listener to match the wrong response.
-    if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
-    const requestId = ++ctx.wsReqNumber;
+    const requestId = Math.floor(100 + Math.random() * 900);
     const otid = utils.generateOfflineThreadingID();
 
     const payload0 = {
@@ -229,12 +217,6 @@ module.exports = (defaultFuncs, api, ctx) => {
       payload0.attachment_fbids = files.map(f => String(Object.values(f)[0]));
     }
 
-    // Use monotonic task IDs so concurrent sends never reuse the same task_id
-    // within a session, which can confuse Facebook's MQTT deduplication.
-    if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
-    const taskId1 = ++ctx.wsTaskNumber;
-    const taskId2 = ++ctx.wsTaskNumber;
-
     const content = {
       app_id: "2220391788200892",
       payload: {
@@ -243,7 +225,7 @@ module.exports = (defaultFuncs, api, ctx) => {
             label: "46",
             payload: payload0,
             queue_name: String(threadID),
-            task_id: taskId1,
+            task_id: 400,
             failure_count: null,
           },
           {
@@ -254,7 +236,7 @@ module.exports = (defaultFuncs, api, ctx) => {
               sync_group: 1,
             },
             queue_name: String(threadID),
-            task_id: taskId2,
+            task_id: 401,
             failure_count: null,
           },
         ],

package/src/apis/setThreadThemeMqtt.js

@@ -47,17 +47,16 @@ module.exports = function (defaultFuncs, api, ctx) {
       });
 
       const messageDefs = [
-        { label: 1013, queue: ['ai_generated_theme', String(threadID)], app_id: '772021112871879' },
-        { label: 1037, queue: ['msgr_custom_thread_theme', String(threadID)], app_id: '772021112871879' },
-        { label: 1028, queue: ['thread_theme_writer', String(threadID)], app_id: '772021112871879' },
-        // label "43" (thread_theme) is the standard FB operation — app_id "2220391788200892" (dongdev confirmed)
-        { label: 43,   queue: 'thread_theme', extra: { source: null, payload: null }, app_id: '2220391788200892' },
+        { label: 1013, queue: ['ai_generated_theme', String(threadID)] },
+        { label: 1037, queue: ['msgr_custom_thread_theme', String(threadID)] },
+        { label: 1028, queue: ['thread_theme_writer', String(threadID)] },
+        { label: 43,   queue: 'thread_theme', extra: { source: null, payload: null } },
       ];
 
-      const messages = messageDefs.map(({ label, queue, extra, app_id }) => {
+      const messages = messageDefs.map(({ label, queue, extra }) => {
         ctx.wsReqNumber += 1;
         return {
-          app_id,
+          app_id: '772021112871879',
           payload: JSON.stringify({
             epoch_id: parseInt(utils.generateOfflineThreadingID()),
             tasks: [makeTask(label, queue, extra)],

package/src/apis/theme.js

@@ -150,11 +150,11 @@ module.exports = function (defaultFuncs, api, ctx) {
         };
 
         const context = {
-          app_id: '2220391788200892',
+          app_id: ctx.appID,
           payload: {
             epoch_id: currentEpochId,
             tasks: [query],
-            version_id: '8798795233522156',
+            version_id: '24631415369801570',
           },
           request_id: request_id,
           type: 3,

package/src/apis/unsendMessage.js

@@ -33,7 +33,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       const taskId = ++ctx.wsTaskNumber;
 
       const content = {
-        app_id: "2220391788200892",
+        app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
         payload: JSON.stringify({
           data_trace_id: null,
           epoch_id: parseInt(utils.generateOfflineThreadingID()),

package/src/engine/client.js

@@ -26,7 +26,7 @@ const DEFAULT_OPTIONS = {
     autoReconnect: true,
     online: true,
     emitReady: false,
-    userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36",
+    userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.7499.182 Safari/537.36",
 };
 
 /**

package/src/utils/antiSuspension.js

@@ -459,35 +459,6 @@ class AntiSuspension {
         return results;
     }
 
-    /**
-     * Prepare before sending — single delay model.
-     * Enforces smart delay, thread throttle, and volume limits, respects circuit breaker.
-     * If the circuit breaker is tripped (checkpoint/suspension detected) or
-     * volume limits are reached, throws to protect the account.
-     */
-    async prepareBeforeMessage(threadID, message) {
-        if (this.isCircuitBreakerTripped()) {
-            const remaining = this.getCircuitBreakerRemainingMs();
-            const { utils } = this._getUtils();
-            utils && utils.warn && utils.warn("AntiSuspension",
-                `Circuit breaker is tripped. Blocking message send to protect account. ` +
-                `Cooldown remaining: ${Math.ceil(remaining / 1000)}s`);
-            const err = new Error(`Circuit breaker is tripped. Pausing sends to protect account. Retry in ${Math.ceil(remaining / 1000)}s.`);
-            err.error = 'circuit_breaker_tripped';
-            err.remainingMs = remaining;
-            throw err;
-        }
-
-        const volumeWarning = this.checkVolumeLimit(threadID);
-        if (volumeWarning) {
-            const { utils } = this._getUtils();
-            utils && utils.warn && utils.warn("AntiSuspension", volumeWarning);
-        }
-
-        await this.enforceThreadThrottling(threadID);
-        this._incrementDailyStats(threadID);
-    }
-
     getConfig() {
         return {
             messageDelayMs: this.messageDelayMs,

package/src/utils/autoReLogin.js

@@ -205,10 +205,7 @@ class AutoReLoginManager {
 
     async pauseAPIRequests() {
         utils.log("AutoReLogin", "Pausing API requests during re-login...");
-        // Wait long enough for in-flight HTTP requests to drain before we start
-        // re-logging in. A 1s pause was too short — the session cookies could
-        // change mid-request, causing follow-up requests to arrive with stale auth.
-        await new Promise(resolve => setTimeout(resolve, 3000));
+        await new Promise(resolve => setTimeout(resolve, 1000));
     }
 
     resolvePendingRequests(success) {

package/src/utils/headers.js

@@ -28,9 +28,6 @@ function sanitizeHeaders(headers) {
     const out = {};
     for (const [key, value] of Object.entries(headers)) {
         if (!key || typeof key !== 'string') continue;
-        // Skip undefined/null values — these are intentional omissions (e.g.
-        // 'Upgrade-Insecure-Requests' on XHR requests that browsers don't send).
-        if (value === undefined || value === null) continue;
         const cleanKey = key.replace(/[^\x21-\x7E]/g, '').trim();
         if (!cleanKey) continue;
         const cleanVal = sanitizeHeaderValue(value);
@@ -62,16 +59,28 @@ function getRandomTimezone() {
 
 /**
  * Generates a comprehensive and realistic set of headers for requests to Facebook.
+ *
+ * Key fingerprint rules enforced here:
+ *  - Navigate (page load): Accept = full HTML accept, Upgrade-Insecure-Requests = 1,
+ *    Sec-Fetch-Dest/Mode/Site = document/navigate/none. NO X-Requested-With, NO Origin.
+ *  - XHR (AJAX/API call): Accept = *\/*, Sec-Fetch-Dest/Mode/Site = empty/cors/same-origin,
+ *    Origin = host. NO Upgrade-Insecure-Requests.
+ *
+ * Real Chrome never sends X-Requested-With automatically — it is a jQuery/XHR
+ * legacy header that Facebook's own modern client does NOT include and that
+ * Facebook's bot-detection system flags when seen on navigation requests.
+ *
  * @param {string} url - The target URL.
  * @param {object} options - Global options from context.
  * @param {object} ctx - The application context (containing fb_dtsg, lsd, etc.).
  * @param {object} customHeader - Any extra headers to merge.
- * @param {string} requestType - Type of request: 'xhr' for GraphQL/AJAX or 'navigate' for page navigation
+ * @param {string} requestType - 'xhr' for GraphQL/AJAX or 'navigate' for page navigation.
  * @returns {object} A complete headers object.
  */
 function getHeaders(url, options, ctx, customHeader, requestType = 'navigate') {
     const persona = options?.persona || 'desktop';
     const isAndroid = persona === 'android' || persona === 'mobile';
+    const isXhr = requestType === 'xhr';
 
     let userAgent, secChUa, secChUaFullVersionList, secChUaPlatform, secChUaPlatformVersion;
     let androidData = null;
@@ -113,8 +122,6 @@ function getHeaders(url, options, ctx, customHeader, requestType = 'navigate') {
     const host = new URL(url).hostname;
     const referer = `https://${host}/`;
 
-    const isXhr = requestType === 'xhr';
-
     const locales = options?.cachedLocale || (androidData?.locale ? androidData.locale.replace('_', '-') : getRandomLocale());
 
     if (isAndroid) {
@@ -162,43 +169,55 @@ function getHeaders(url, options, ctx, customHeader, requestType = 'navigate') {
     const isMac = secChUaPlatform === '"macOS"';
     const isLinux = secChUaPlatform === '"Linux"';
 
+    // Navigate (page load) Accept mirrors real Chrome — includes avif/webp/apng
+    // XHR Accept is simply */* as sent by Chrome's fetch/XHR APIs
+    const acceptHeader = isXhr
+        ? '*/*'
+        : 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7';
+
     const headers = {
-        'Accept': isXhr
-            ? 'application/json, text/plain, */*'
-            : 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+        'Accept': acceptHeader,
         'Accept-Language': locales,
         'Accept-Encoding': 'gzip, deflate, br',
         'Cache-Control': 'no-cache',
         'Connection': 'keep-alive',
-        'DNT': '1',
         'Host': host,
         'Pragma': 'no-cache',
         'Referer': referer,
         'Sec-Ch-Ua': secChUa,
         'Sec-Ch-Ua-Full-Version-List': secChUaFullVersionList,
         'Sec-Ch-Ua-Mobile': '?0',
+        'Sec-Ch-Ua-Model': '""',
         'Sec-Ch-Ua-Platform': secChUaPlatform,
         'Sec-Ch-Ua-Platform-Version': secChUaPlatformVersion,
         'Sec-Fetch-Dest': isXhr ? 'empty' : 'document',
         'Sec-Fetch-Mode': isXhr ? 'cors' : 'navigate',
         'Sec-Fetch-Site': isXhr ? 'same-origin' : 'none',
         'User-Agent': userAgent,
-        'Upgrade-Insecure-Requests': isXhr ? undefined : '1',
-        // X-Requested-With is only sent by XHR calls, NOT by page navigations.
-        // Sending it on navigate requests is a clear bot-detection fingerprint
-        // because real browsers never include it for document loads.
-        ...(isXhr ? { 'X-Requested-With': 'XMLHttpRequest' } : {})
     };
 
-    if (isWindows || isMac || isLinux) {
-        headers['Sec-Ch-Ua-Arch'] = '"x86"';
-        headers['Sec-Ch-Ua-Bitness'] = '"64"';
+    // Upgrade-Insecure-Requests is a navigation-only hint — browsers never
+    // include it on XHR/fetch calls. Sending it on XHR is a bot fingerprint.
+    if (!isXhr) {
+        headers['Upgrade-Insecure-Requests'] = '1';
     }
 
+    // Origin is only present on cross-origin or same-origin XHR/fetch requests.
+    // Real browsers do NOT send Origin on top-level page navigations (Sec-Fetch-Mode: navigate).
     if (isXhr) {
         headers['Origin'] = `https://${host}`;
     }
 
+    // X-Requested-With is NOT a browser-native header — it is a jQuery/XHR
+    // convention that Facebook's own modern web client does not set.
+    // Sending it (especially on navigate requests) is a well-known bot fingerprint
+    // that Facebook's detection system keys on. We never send it.
+
+    if (isWindows || isMac || isLinux) {
+        headers['Sec-Ch-Ua-Arch'] = '"x86"';
+        headers['Sec-Ch-Ua-Bitness'] = '"64"';
+    }
+
     if (ctx) {
         if (ctx.lsd || ctx.fb_dtsg) {
             headers['X-Fb-Lsd'] = ctx.lsd || ctx.fb_dtsg;
@@ -214,7 +233,6 @@ function getHeaders(url, options, ctx, customHeader, requestType = 'navigate') {
         }
     }
 
-
     if (customHeader) {
         Object.assign(headers, customHeader);
         if (customHeader.noRef) {
@@ -232,4 +250,4 @@ module.exports = {
     meta,
     getRandomLocale,
     getRandomTimezone
-};
+};

package/src/utils/lsRequest.js

@@ -122,7 +122,7 @@ function buildLsEnvelope(ctx, tasks, versionId = "25459622483894963") {
     const requestId = ++ctx.wsReqNumber;
 
     const envelope = {
-        app_id: "2220391788200892",
+        app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
         payload: JSON.stringify({
             epoch_id: generateEpochId(),
             tasks,

package/src/utils/rateLimiter.js

@@ -14,12 +14,8 @@ class RateLimiter {
 
         this.ERROR_CACHE_TTL = 300000;
         this.COOLDOWN_DURATION = 60000;
-        // Raised from 50 → 120 req/min. The old limit was too aggressive — it
-        // throttled legitimate API calls (thread info lookups, getSeqID, markAsRead
-        // etc.) and caused unnecessary delays that looked bot-like when many
-        // requests were queued. Facebook's actual rate-limiting kicks in far higher.
-        this.MAX_REQUESTS_PER_MINUTE = 120;
-        this.MAX_CONCURRENT_REQUESTS = 8;
+        this.MAX_REQUESTS_PER_MINUTE = 50;
+        this.MAX_CONCURRENT_REQUESTS = 5;
 
         this.activeRequests = 0;
 
@@ -29,9 +25,7 @@ class RateLimiter {
 
         // Per-endpoint sliding windows
         this._endpointWindows = new Map();
-        // Raised from 20 → 40 req/min per endpoint. The old value throttled
-        // burst-write scenarios (e.g. thread hydration after reconnect) unnecessarily.
-        this._MAX_PER_ENDPOINT_PER_MINUTE = 40;
+        this._MAX_PER_ENDPOINT_PER_MINUTE = 20;
     }
 
     configure(opts = {}) {

package/src/utils/user-agents.js

@@ -1,47 +1,81 @@
 "use strict";
 const { getRandom } = require("./constants");
 
+// Chrome versions ordered newest-first. Keep this list current — Facebook's
+// bot-detection compares claimed UA versions against known release timelines.
+// Versions that are too old (pre-120) or too new (unreleased) are flagged.
 const BROWSER_DATA = {
     windows: {
         platform: "Windows NT 10.0; Win64; x64",
-        // Ordered from newest to oldest so random selection skews toward current builds
         chromeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0", "134.0.0.0", "133.0.0.0",
-            "132.0.6834.160", "131.0.6778.205", "130.0.6723.119", "129.0.6668.100"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114", "139.0.7258.100", "138.0.7204.92",
+            "137.0.7151.68",  "136.0.7103.113", "135.0.7049.96",
+            "134.0.6998.165"
         ],
         edgeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0", "134.0.0.0",
-            "133.0.3065.92", "132.0.2957.140", "131.0.2903.112"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114", "139.0.7258.100"
         ],
         platformVersion: '"15.0.0"'
     },
     mac: {
         platform: "Macintosh; Intel Mac OS X 10_15_7",
         chromeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0", "134.0.0.0", "133.0.0.0",
-            "132.0.6834.160", "131.0.6778.205", "130.0.6723.119", "129.0.6668.100"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114", "139.0.7258.100", "138.0.7204.92",
+            "137.0.7151.68",  "136.0.7103.113", "135.0.7049.96",
+            "134.0.6998.165"
         ],
         edgeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0", "134.0.0.0",
-            "133.0.3065.92", "132.0.2957.140"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114", "139.0.7258.100"
         ],
-        platformVersion: '"14.7.1"'
+        platformVersion: '"14.7.0"'
     },
     linux: {
         platform: "X11; Linux x86_64",
         chromeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0", "134.0.0.0",
-            "133.0.0.0", "132.0.6834.160", "131.0.6778.205"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114", "139.0.7258.100", "138.0.7204.92",
+            "137.0.7151.68",  "136.0.7103.113"
         ],
         edgeVersions: [
-            "137.0.0.0", "136.0.0.0", "135.0.0.0",
-            "134.0.0.0", "133.0.3065.92"
+            "143.0.7499.182", "142.0.7410.114", "141.0.7358.100",
+            "140.0.7294.114"
         ],
         platformVersion: '""'
     }
 };
 
-const defaultUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36";
+const defaultUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.7499.182 Safari/537.36";
+
+/**
+ * Builds the correct GREASE token for a given major Chrome version.
+ *
+ * Chrome picks one of several "not a brand" placeholder strings via a
+ * deterministic algorithm keyed to the major version.  Using the wrong
+ * GREASE value is a detectable fingerprint mismatch.
+ *
+ * The set used by Chrome 100+ rotates through these four forms based on
+ * (major % 4):
+ *   0 → "Not)A;Brand"
+ *   1 → "Not A(Brand"
+ *   2 → "Not;A=Brand"
+ *   3 → "Not A Brand"   (older alias)
+ *
+ * @param {number} major - Chrome major version number.
+ * @returns {string} - GREASE brand string without the surrounding quotes.
+ */
+function greaseForVersion(major) {
+    const forms = [
+        "Not)A;Brand",
+        "Not A(Brand",
+        "Not;A=Brand",
+        "Not A Brand"
+    ];
+    return forms[major % 4];
+}
 
 /**
  * Generates a realistic, randomized User-Agent string and related Sec-CH headers.
@@ -52,32 +86,42 @@ function randomUserAgent() {
     const os = getRandom(Object.keys(BROWSER_DATA));
     const data = BROWSER_DATA[os];
 
-    const useEdge = Math.random() > 0.7 && data.edgeVersions;
+    const useEdge = Math.random() > 0.75 && data.edgeVersions && data.edgeVersions.length > 0;
     const versions = useEdge ? data.edgeVersions : data.chromeVersions;
     const version = getRandom(versions);
     const majorVersion = version.split('.')[0];
+    const major = parseInt(majorVersion, 10);
     const browserName = useEdge ? 'Microsoft Edge' : 'Google Chrome';
-    const browserIdentifier = useEdge ? 'Edg' : 'Chrome';
 
-    const userAgent = useEdge 
+    const userAgent = useEdge
         ? `Mozilla/5.0 (${data.platform}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36 Edg/${version}`
         : `Mozilla/5.0 (${data.platform}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${version} Safari/537.36`;
 
-    const greeseValue = Math.random() > 0.5 ? '99' : '8';
-    const brands = useEdge ? [
-        `"Chromium";v="${majorVersion}"`,
-        `"Not(A:Brand";v="${greeseValue}"`,
-        `"${browserName}";v="${majorVersion}"`
-    ] : [
-        `"${browserName}";v="${majorVersion}"`,
-        `"Not;A=Brand";v="${greeseValue}"`,
-        `"Chromium";v="${majorVersion}"`
-    ];
+    // Use the version-correct GREASE placeholder — mismatched GREASE is a
+    // detectable fingerprint that Facebook's bot detection system checks.
+    const greaseStr = greaseForVersion(major);
+    const greaseVersion = "99";
+
+    let brands;
+    if (useEdge) {
+        brands = [
+            `"Chromium";v="${majorVersion}"`,
+            `"${browserName}";v="${majorVersion}"`,
+            `"${greaseStr}";v="${greaseVersion}"`
+        ];
+    } else {
+        brands = [
+            `"${browserName}";v="${majorVersion}"`,
+            `"Chromium";v="${majorVersion}"`,
+            `"${greaseStr}";v="${greaseVersion}"`
+        ];
+    }
 
     const secChUa = brands.join(', ');
+
+    // Full version list replaces the major-only version with the full string
     const secChUaFullVersionList = brands.map(b => {
-        const match = b.match(/v="(\d+)"/);
-        if (match && match[1] === majorVersion) {
+        if (b.includes(`v="${majorVersion}"`)) {
             return b.replace(`v="${majorVersion}"`, `v="${version}"`);
         }
         return b;
@@ -124,7 +168,7 @@ function randomFbav() {
 }
 
 function randomOrcaUA() {
-    const androidVersions = ["10", "11", "12", "13", "14", "15"];
+    const androidVersions = ["8.1.0", "9", "10", "11", "12", "13", "14"];
     const devices = [
         { brand: "samsung", model: "SM-G996B" },
         { brand: "samsung", model: "SM-S908E" },
@@ -254,4 +298,4 @@ module.exports = {
     randomOrcaUA,
     generateUserAgentByPersona,
     cachePersonaData,
-};
+};