@lazyneoaz/metachat 1.0.10 → 1.1.0

package/package.json

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

package/src/apis/addUserToGroup.js

@@ -19,7 +19,7 @@ module.exports = (defaultFuncs, api, ctx) => {
     }
 
     try {
-      if (!ctx.mqttClient) {
+      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
         throw new Error("Not connected to MQTT. Please use listenMqtt first.");
       }
 

package/src/apis/changeAdminStatus.js

@@ -20,112 +20,103 @@ module.exports = function (defaultFuncs, api, ctx) {
                 if (err) return rejectFunc(err);
                 resolveFunc(data);
             };
+        } else {
+            const _userCb = callback;
+            callback = function(err, data) {
+                if (err) { _userCb(err); return rejectFunc(err); }
+                _userCb(null, data);
+                resolveFunc(data);
+            };
         }
 
         if (getType(threadID) !== "String") {
-            return callback({ error: "changeAdminStatus: threadID must be a string" });
+            callback(new Error("changeAdminStatus: threadID must be a string"));
+            return returnPromise;
         }
         if (getType(adminID) !== "String" && getType(adminID) !== "Array") {
-            return callback({ error: "changeAdminStatus: adminID must be a string or an array" });
+            callback(new Error("changeAdminStatus: adminID must be a string or an array"));
+            return returnPromise;
         }
         if (getType(adminStatus) !== "Boolean") {
-            return callback({ error: "changeAdminStatus: adminStatus must be true or false" });
+            callback(new Error("changeAdminStatus: adminStatus must be true or false"));
+            return returnPromise;
         }
 
-        if (ctx.mqttClient) {
+        const isAdmin = adminStatus ? 1 : 0;
+
+        if (ctx.mqttClient && ctx.mqttClient.connected) {
             const tasks = [];
-            const isAdmin = adminStatus ? 1 : 0;
             const epochID = utils.generateOfflineThreadingID();
 
-            if (getType(adminID) === "Array") {
-                adminID.forEach((id, index) => {
-                    tasks.push({
-                        failure_count: null,
-                        label: "25",
-                        payload: JSON.stringify({
-                            thread_key: threadID,
-                            contact_id: id,
-                            is_admin: isAdmin
-                        }),
-                        queue_name: "admin_status",
-                        task_id: index + 1
-                    });
-                });
-            } else {
+            if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+            if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
+
+            const adminIDs = getType(adminID) === "Array" ? adminID : [adminID];
+            adminIDs.forEach((id) => {
                 tasks.push({
                     failure_count: null,
                     label: "25",
                     payload: JSON.stringify({
                         thread_key: threadID,
-                        contact_id: adminID,
+                        contact_id: id,
                         is_admin: isAdmin
                     }),
                     queue_name: "admin_status",
-                    task_id: 1
+                    task_id: ++ctx.wsTaskNumber
                 });
-            }
+            });
 
-            let count_req = 0;
             const form = JSON.stringify({
-                app_id: "2220391788200892",
+                app_id: String(ctx.appID || ctx.mqttAppID || "2220391788200892"),
                 payload: JSON.stringify({
                     epoch_id: epochID,
                     tasks: tasks,
                     version_id: "8798795233522156"
                 }),
-                request_id: ++count_req,
+                request_id: ++ctx.wsReqNumber,
                 type: 3
             });
 
-            ctx.mqttClient.publish("/ls_req", form, {}, (err, _packet) => {
+            ctx.mqttClient.publish("/ls_req", form, { qos: 1, retain: false }, (err) => {
                 if (err) {
                     utils.error("changeAdminStatus (MQTT)", err);
-                    return callback(err);
-                } else {
-                    utils.log("Admin status changed successfully via MQTT");
-                    return callback(null, { success: true });
+                    return callback(err instanceof Error ? err : new Error(String(err)));
                 }
+                utils.log("Admin status changed successfully via MQTT");
+                return callback(null, { success: true });
             });
         } else {
             utils.warn("MQTT client not available, using HTTP fallback for changeAdminStatus");
             const tasks = [];
             const epochID = utils.generateOfflineThreadingID();
 
-            if (getType(adminID) === "Array") {
-                adminID.forEach((id, index) => {
-                    tasks.push({
-                        label: '25',
-                        payload: JSON.stringify({ thread_key: threadID, contact_id: id, is_admin: adminStatus }),
-                        queue_name: 'admin_status',
-                        task_id: index + 1,
-                        failure_count: null
-                    });
-                });
-            } else {
+            if (typeof ctx.wsReqNumber !== "number") ctx.wsReqNumber = 0;
+            if (typeof ctx.wsTaskNumber !== "number") ctx.wsTaskNumber = 0;
+
+            const adminIDs = getType(adminID) === "Array" ? adminID : [adminID];
+            adminIDs.forEach((id) => {
                 tasks.push({
-                    label: '25',
-                    payload: JSON.stringify({ thread_key: threadID, contact_id: adminID, is_admin: adminStatus }),
-                    queue_name: 'admin_status',
-                    task_id: 1,
+                    label: "25",
+                    payload: JSON.stringify({ thread_key: threadID, contact_id: id, is_admin: isAdmin }),
+                    queue_name: "admin_status",
+                    task_id: ++ctx.wsTaskNumber,
                     failure_count: null
                 });
-            }
+            });
 
             const form = {
                 fb_dtsg: ctx.fb_dtsg,
-                request_id: 1,
+                request_id: ++ctx.wsReqNumber,
                 type: 3,
-                payload: {
-                    version_id: '3816854585040595',
+                payload: JSON.stringify({
+                    version_id: "8798795233522156",
                     tasks: tasks,
                     epoch_id: epochID,
                     data_trace_id: null
-                },
-                app_id: '772021112871879'
+                }),
+                app_id: String(ctx.appID || ctx.mqttAppID || "772021112871879")
             };
 
-            form.payload = JSON.stringify(form.payload);
-
             defaultFuncs
                 .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
                 .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
@@ -135,7 +126,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                 })
                 .catch(err => {
                     utils.error("changeAdminStatus (HTTP)", err);
-                    callback(err);
+                    callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
                 });
         }
 

package/src/apis/changeArchivedStatus.js

@@ -11,19 +11,27 @@ module.exports = (defaultFuncs, api, ctx) => {
       rejectFunc = reject;
     });
 
+    // Detect (threadIDs, callback) — archive omitted
+    if (utils.getType(archive) === "Function") {
+      callback = archive;
+      archive = true;
+    }
+
     if (!callback) {
       callback = (err, result) => {
         if (err) return rejectFunc(err);
         resolveFunc(result);
       };
+    } else {
+      const _userCb = callback;
+      callback = (err, result) => {
+        if (err) { _userCb(err); return rejectFunc(err); }
+        _userCb(null, result);
+        resolveFunc(result);
+      };
     }
 
     try {
-      if (utils.getType(archive) === "Function") {
-        callback = archive;
-        archive = true;
-      }
-
       if (utils.getType(archive) !== "Boolean") {
         throw new Error("archive parameter must be a boolean");
       }
@@ -35,7 +43,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       const form = {
         should_archive: archive
       };
-      
+
       threadIDs.forEach(id => {
         form[`thread_fbids[${id}]`] = true;
       });
@@ -47,13 +55,13 @@ module.exports = (defaultFuncs, api, ctx) => {
       ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res && res.error) {
-        throw res;
+        throw new Error(String(res.error_msg || res.error || "changeArchivedStatus failed"));
       }
 
       callback(null, { success: true });
     } catch (err) {
       utils.error("changeArchivedStatus", err);
-      callback(err);
+      callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
     }
 
     return returnPromise;

package/src/apis/changeAvatar.js

@@ -18,7 +18,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       {}
     ).then(utils.parseAndCheckLogin(ctx, defaultFuncs))
     .then(resData => {
-      if (resData.error) throw resData;
+      if (resData.error) throw new Error(resData.error_msg || resData.errorSummary || String(resData.error));
       return resData;
     });
   }
@@ -89,7 +89,7 @@ module.exports = (defaultFuncs, api, ctx) => {
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res.errors) {
-        throw res;
+        throw new Error(JSON.stringify(res.errors));
       }
 
       callback(null, res[0].data.profile_picture_set);

package/src/apis/changeBio.js

@@ -55,7 +55,7 @@ module.exports = (defaultFuncs, api, ctx) => {
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res.errors) {
-        throw res;
+        throw new Error(JSON.stringify(res.errors));
       }
 
       callback(null, { success: true });

package/src/apis/changeBlockedStatus.js

@@ -40,7 +40,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res && res.error) {
-        throw res;
+        throw new Error(res.error_msg || res.errorSummary || String(res.error));
       }
 
       return callback(null, { success: true, blocked: block });

package/src/apis/changeGroupImage.js

@@ -30,10 +30,22 @@ module.exports = (defaultFuncs, api, ctx) => {
         if (err) return rejectFunc(err);
         resolveFunc(result);
       };
+    } else {
+      const _userCb = callback;
+      callback = (err, result) => {
+        if (err) { _userCb(err); return rejectFunc(err); }
+        _userCb(null, result);
+        resolveFunc(result);
+      };
     }
 
+    // Hoist these before the try so they are accessible in the catch block
+    let responseHandled = false;
+    let timeout = null;
+    let onResponse = null;
+
     try {
-      if (!ctx.mqttClient) {
+      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
         throw new Error("Not connected to MQTT. Please use listenMqtt first.");
       }
 
@@ -48,8 +60,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       const reqID = ++ctx.wsReqNumber;
       const taskID = ++ctx.wsTaskNumber;
 
-      let responseHandled = false;
-      const onResponse = (topic, message) => {
+      onResponse = (topic, message) => {
         if (topic !== "/ls_resp" || responseHandled) return;
         let jsonMsg;
         try {
@@ -63,16 +74,13 @@ module.exports = (defaultFuncs, api, ctx) => {
         clearTimeout(timeout);
         ctx.mqttClient.removeListener("message", onResponse);
         callback(null, { success: true, response: jsonMsg.payload });
-        resolveFunc({ success: true, response: jsonMsg.payload });
       };
 
-      const timeout = setTimeout(() => {
+      timeout = setTimeout(() => {
         if (!responseHandled) {
           responseHandled = true;
           ctx.mqttClient.removeListener("message", onResponse);
-          const err = new Error("MQTT request timeout");
-          callback(err);
-          rejectFunc(err);
+          callback(new Error("MQTT request timeout"));
         }
       }, 30000);
 
@@ -102,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
@@ -116,18 +124,18 @@ module.exports = (defaultFuncs, api, ctx) => {
           responseHandled = true;
           clearTimeout(timeout);
           ctx.mqttClient.removeListener("message", onResponse);
-          callback(err);
-          rejectFunc(err);
+          callback(err instanceof Error ? err : new Error(String(err)));
         }
       });
     } catch (err) {
       if (!responseHandled) {
         responseHandled = true;
-        clearTimeout(timeout);
-        ctx.mqttClient.removeListener("message", onResponse);
+        if (timeout) clearTimeout(timeout);
+        if (onResponse && ctx.mqttClient) {
+          try { ctx.mqttClient.removeListener("message", onResponse); } catch (_) {}
+        }
         utils.error("changeGroupImage", err);
-        callback(err);
-        rejectFunc(err);
+        callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
       }
     }
 

package/src/apis/changeThreadColor.js

@@ -20,7 +20,7 @@ module.exports = (defaultFuncs, api, ctx) => {
     }
 
     try {
-      if (!ctx.mqttClient) {
+      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
         throw new Error("Not connected to MQTT. Please use listenMqtt first.");
       }
 

package/src/apis/changeThreadEmoji.js

@@ -17,7 +17,15 @@ module.exports = function (defaultFuncs, api, ctx) {
         }
         resolveFunc();
       };
+    } else {
+      const _userCb = callback;
+      callback = function(err) {
+        if (err) { _userCb(err); return rejectFunc(err); }
+        _userCb(null);
+        resolveFunc();
+      };
     }
+
     const form = {
       emoji_choice: emoji,
       thread_or_other_fbid: threadID,
@@ -32,20 +40,18 @@ module.exports = function (defaultFuncs, api, ctx) {
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function (resData) {
         if (resData.error === 1357031) {
-          throw {
-            error:
-              "Trying to change emoji of a chat that doesn't exist. Have at least one message in the thread before trying to change the emoji.",
-          };
+          throw new Error(
+            "Trying to change emoji of a chat that doesn't exist. Have at least one message in the thread before trying to change the emoji."
+          );
         }
         if (resData.error) {
-          throw resData;
+          throw new Error(String(resData.error_msg || resData.error || "changeThreadEmoji failed"));
         }
-
-        return callback();
+        return callback(null);
       })
       .catch(function (err) {
         utils.error("changeThreadEmoji", err);
-        return callback(err);
+        return callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
       });
 
     return returnPromise;

package/src/apis/createNewGroup.js

@@ -11,18 +11,26 @@ module.exports = (defaultFuncs, api, ctx) => {
       rejectFunc = reject;
     });
 
+    if (utils.getType(groupTitle) === "Function") {
+      callback = groupTitle;
+      groupTitle = null;
+    }
+
     if (!callback) {
       callback = (err, result) => {
         if (err) return rejectFunc(err);
         resolveFunc(result);
       };
+    } else {
+      const _userCb = callback;
+      callback = (err, result) => {
+        if (err) { _userCb(err); return rejectFunc(err); }
+        _userCb(null, result);
+        resolveFunc(result);
+      };
     }
 
     try {
-      if (utils.getType(groupTitle) === "Function") {
-        callback = groupTitle;
-        groupTitle = null;
-      }
 
       if (utils.getType(participantIDs) !== "Array") {
         throw new Error("createNewGroup: participantIDs should be an array.");
@@ -64,7 +72,7 @@ module.exports = (defaultFuncs, api, ctx) => {
         .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res.errors) {
-        throw res;
+        throw new Error(JSON.stringify(res.errors));
       }
 
       const threadID = res.data.messenger_group_thread_create.thread.thread_key.thread_fbid;

package/src/apis/createPoll.js

@@ -19,7 +19,7 @@ module.exports = (defaultFuncs, api, ctx) => {
     }
 
     try {
-      if (!ctx.mqttClient) {
+      if (!ctx.mqttClient || !ctx.mqttClient.connected) {
         throw new Error("Not connected to MQTT. Please use listenMqtt first.");
       }
 
@@ -35,6 +35,9 @@ module.exports = (defaultFuncs, api, ctx) => {
         throw new Error("options must be an array with at least 2 options");
       }
 
+      if (typeof ctx.wsReqNumber !== 'number') ctx.wsReqNumber = 0;
+      if (typeof ctx.wsTaskNumber !== 'number') ctx.wsTaskNumber = 0;
+
       const payload = {
         epoch_id: utils.generateOfflineThreadingID(),
         tasks: [
@@ -48,10 +51,10 @@ module.exports = (defaultFuncs, api, ctx) => {
               sync_group: 1
             }),
             queue_name: "poll_creation",
-            task_id: Math.floor(Math.random() * 1001)
+            task_id: ++ctx.wsTaskNumber
           }
         ],
-        version_id: "8768858626531631"
+        version_id: "34195258046739157"
       };
 
       const form = JSON.stringify({
@@ -61,8 +64,14 @@ module.exports = (defaultFuncs, api, ctx) => {
         type: 3
       });
 
-      ctx.mqttClient.publish("/ls_req", form, { qos: 1, retain: false });
-      callback(null, { success: true });
+      ctx.mqttClient.publish("/ls_req", form, { qos: 1, retain: false }, (pubErr) => {
+        if (pubErr) {
+          utils.error("createPoll", pubErr);
+          callback(pubErr instanceof Error ? pubErr : new Error(String(pubErr)));
+        } else {
+          callback(null, { success: true });
+        }
+      });
     } catch (err) {
       utils.error("createPoll", err);
       callback(err);

package/src/apis/deleteMessage.js

@@ -16,27 +16,30 @@ module.exports = (defaultFuncs, api, ctx) => {
         if (err) return rejectFunc(err);
         resolveFunc(result);
       };
+    } else {
+      const _userCb = callback;
+      callback = (err, result) => {
+        if (err) { _userCb(err); return rejectFunc(err); }
+        _userCb(null, result);
+        resolveFunc(result);
+      };
     }
 
     try {
-      const form = {
-        message_id: messageID
-      };
-
       const res = await defaultFuncs.post(
         "https://www.facebook.com/ajax/mercury/delete_messages.php",
         ctx.jar,
-        form
+        { message_id: messageID }
       ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res && res.error) {
-        throw res;
+        throw new Error(String(res.error_msg || res.error || "deleteMessage failed"));
       }
 
-      return callback(null, { success: true });
+      callback(null, { success: true });
     } catch (err) {
       utils.error("deleteMessage", err);
-      callback(err);
+      callback(err instanceof Error ? err : new Error(String(err && err.message ? err.message : err)));
     }
 
     return returnPromise;

package/src/apis/deleteThread.js

@@ -38,7 +38,7 @@ module.exports = (defaultFuncs, api, ctx) => {
       ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
 
       if (res && res.error) {
-        throw res;
+        throw new Error(res.error_msg || res.errorSummary || String(res.error));
       }
 
       callback(null, { success: true });