@lazyneoaz/metachat 1.1.3 → 1.1.6

package/package.json

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