shadowx-fca 2.4.0 → 2.5.0

package/src/sendMessage.js

@@ -1,243 +1,232 @@
 "use strict";
 
+
 const utils = require('../utils');
-// @NethWs3Dev
 
 const allowedProperties = {
-	attachment: true,
-	url: true,
-	sticker: true,
-	emoji: true,
-	emojiSize: true,
-	body: true,
-	mentions: true,
-	location: true,
+  attachment : true,
+  url        : true,
+  sticker    : true,
+  emoji      : true,
+  emojiSize  : true,
+  body       : true,
+  mentions   : true,
+  location   : true,
 };
 
+
+
 module.exports = (defaultFuncs, api, ctx) => {
-	async function uploadAttachment(attachments) {
-		var uploads = [];
-		for (var i = 0; i < attachments.length; i++) {
-		 if (!utils.isReadableStream(attachments[i])) {
-				throw new Error("Attachment should be a readable stream and not " + utils.getType(attachments[i]) + ".");
-		 }
-		 const oksir = await defaultFuncs.postFormData("https://upload.facebook.com/ajax/mercury/upload.php", ctx.jar,{
-			 upload_1024: attachments[i],
-			 voice_clip: "true"
-		 }, {}).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
-		 if (oksir.error) {
-			 throw new Error(resData);
-		 }
-		 uploads.push(oksir.payload.metadata[0]);
-		}
-		return uploads;
-	}
-
-	async function getUrl(url) {
-		const resData = await defaultFuncs.post("https://www.facebook.com/message_share_attachment/fromURI/", ctx.jar, {
-			image_height: 960,
-			image_width: 960,
-			uri: url
-		}).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
-		if (!resData || resData.error || !resData.payload){
-				throw new Error(resData);
-		}
-	}
-
-	async function sendContent(form, threadID, isSingleUser, messageAndOTID, callback) {
-		// There are three cases here:
-		// 1. threadID is of type array, where we're starting a new group chat with users
-		//    specified in the array.
-		// 2. User is sending a message to a specific user.
-		// 3. No additional form params and the message goes to an existing group chat.
-		if (utils.getType(threadID) === "Array") {
-			for (var i = 0; i < threadID.length; i++) {
-				form["specific_to_list[" + i + "]"] = "fbid:" + threadID[i];
-			}
-			form["specific_to_list[" + threadID.length + "]"] = "fbid:" + ctx.userID;
-			form["client_thread_id"] = "root:" + messageAndOTID;
-			utils.log("sendMessage", "Sending message to multiple users: " + threadID);
-		} else {
-			const threadIDStr = threadID.toString();
-			// Check if it's a DM: doesn't start with numeric group ID pattern or explicitly marked as single user
-			const isDM = !threadIDStr.match(/^\d{15,}$/) || isSingleUser === true;
-			
-			// This means that threadID is the id of a user, and the chat
-			// is a single person chat
-			if (isDM) {
-				form["specific_to_list[0]"] = "fbid:" + threadID;
-				form["specific_to_list[1]"] = "fbid:" + ctx.userID;
-				form["other_user_fbid"] = threadID;
-			} else {
-				form["thread_fbid"] = threadID;
-			}
-		}
-
-		if (ctx.globalOptions.pageID) {
-			form["author"] = "fbid:" + ctx.globalOptions.pageID;
-			form["specific_to_list[1]"] = "fbid:" + ctx.globalOptions.pageID;
-			form["creator_info[creatorID]"] = ctx.userID;
-			form["creator_info[creatorType]"] = "direct_admin";
-			form["creator_info[labelType]"] = "sent_message";
-			form["creator_info[pageID]"] = ctx.globalOptions.pageID;
-			form["request_user_id"] = ctx.globalOptions.pageID;
-			form["creator_info[profileURI]"] =
-				"https://www.facebook.com/profile.php?id=" + ctx.userID;
-		}
-
-		const resData = await defaultFuncs.post("https://www.facebook.com/messaging/send/", ctx.jar, form).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
-		if (!resData) {
-			throw new Error("Send message failed.");
-		}
-		if (resData.error) {
-			if (resData.error === 1545012) {
-				utils.warn("sendMessage", "Got error 1545012. This might mean that you're not part of the conversation " + threadID);
-				throw new Error(`Cannot send message to thread ${threadID}: Bot is not part of this conversation (Error 1545012)`);
-			}
-			throw new Error(resData);
-		}
-		const messageInfo = resData.payload.actions.reduce((p, v) => {
-				return { threadID: v.thread_fbid, messageID: v.message_id, timestamp: v.timestamp } || p;
-		}, null);
-		return messageInfo;
-	}
-
-	return async (msg, threadID, callback, replyToMessage, isSingleUser = null) => {
-		// Handle different parameter patterns for backward compatibility
-		if (typeof callback === "string" || (callback && typeof callback === "object")) {
-			// callback is actually replyToMessage, shift parameters
-			isSingleUser = replyToMessage;
-			replyToMessage = callback;
-			callback = function() {};
-		} else if (typeof callback !== "function") {
-			callback = function() {};
-		}
-
-		let msgType = utils.getType(msg);
-		let threadIDType = utils.getType(threadID);
-		let messageIDType = utils.getType(replyToMessage);
-		if (msgType !== "String" && msgType !== "Object") throw new Error("Message should be of type string or object and not " + msgType + ".");
-		if (threadIDType !== "Array" && threadIDType !== "Number" && threadIDType !== "String") throw new Error("ThreadID should be of type number, string, or array and not " + threadIDType + ".");
-		if (replyToMessage && messageIDType !== 'String' && messageIDType !== 'string') throw new Error("MessageID should be of type string and not " + messageIDType + ".");
-		if (msgType === "String") {
-			msg = { body: msg };
-		}
-		
-		// Auto-detect if this is a DM if not explicitly specified
-		if (isSingleUser === null && ctx.threadTypes && ctx.threadTypes[threadID]) {
-			isSingleUser = ctx.threadTypes[threadID] === 'dm';
-		} else if (isSingleUser === null) {
-			// Fallback: check if threadID looks like a user ID (15 digits) vs group ID (longer)
-			const threadIDStr = threadID.toString();
-			isSingleUser = threadIDStr.length === 15 || !threadIDStr.match(/^\d{16,}$/);
-		}
-		let disallowedProperties = Object.keys(msg).filter(prop => !allowedProperties[prop]);
-		if (disallowedProperties.length > 0) {
-			throw new Error("Dissallowed props: `" + disallowedProperties.join(", ") + "`");
-		}
-		let messageAndOTID = utils.generateOfflineThreadingID();
-		let form = {
-			client: "mercury",
-			action_type: "ma-type:user-generated-message",
-			author: "fbid:" + ctx.userID,
-			timestamp: Date.now(),
-			timestamp_absolute: "Today",
-			timestamp_relative: utils.generateTimestampRelative(),
-			timestamp_time_passed: "0",
-			is_unread: false,
-			is_cleared: false,
-			is_forward: false,
-			is_filtered_content: false,
-			is_filtered_content_bh: false,
-			is_filtered_content_account: false,
-			is_filtered_content_quasar: false,
-			is_filtered_content_invalid_app: false,
-			is_spoof_warning: false,
-			source: "source:chat:web",
-			"source_tags[0]": "source:chat",
-			...(msg.body && {
-					body: msg.body
-			}),
-			html_body: false,
-			ui_push_phase: "V3",
-			status: "0",
-			offline_threading_id: messageAndOTID,
-			message_id: messageAndOTID,
-			threading_id: utils.generateThreadingID(ctx.clientID),
-			"ephemeral_ttl_mode:": "0",
-			manual_retry_cnt: "0",
-			has_attachment: !!(msg.attachment || msg.url || msg.sticker),
-			signatureID: utils.getSignatureID(),
-			...(replyToMessage && {
-					replied_to_message_id: replyToMessage
-			})
-		};
-
-		if (msg.location) {
-			if (!msg.location.latitude || !msg.location.longitude) throw new Error("location property needs both latitude and longitude");
-			form["location_attachment[coordinates][latitude]"] = msg.location.latitude;
-			form["location_attachment[coordinates][longitude]"] = msg.location.longitude;
-			form["location_attachment[is_current_location]"] = !!msg.location.current;
-		}
-		if (msg.sticker) {
-			form["sticker_id"] = msg.sticker;
-		}
-		if (msg.attachment) {
-			form.image_ids = [];
-			form.gif_ids = [];
-			form.file_ids = [];
-			form.video_ids = [];
-			form.audio_ids = [];
-			if (utils.getType(msg.attachment) !== "Array") {
-				msg.attachment = [msg.attachment];
-			}
-			const files = await uploadAttachment(msg.attachment);
-			files.forEach(file => {
-					const type = Object.keys(file)[0];
-					form["" + type + "s"].push(file[type]);
-			}); 
-		}
-		if (msg.url) {
-			form["shareable_attachment[share_type]"] = "100";
-			const params = await getUrl(msg.url);
-			form["shareable_attachment[share_params]"] = params;
-		}
-		if (msg.emoji) {
-			if (!msg.emojiSize) {
-				msg.emojiSize = "medium";
-			}
-			if (msg.emojiSize !== "small" && msg.emojiSize !== "medium" && msg.emojiSize !== "large") {
-				throw new Error("emojiSize property is invalid");
-			}
-			if (!form.body) {
-				throw new Error("body is not empty");
-			}
-			form.body = msg.emoji;
-			form["tags[0]"] = "hot_emoji_size:" + msg.emojiSize;
-		} 
-		if (msg.mentions) {
-			for (let i = 0; i < msg.mentions.length; i++) {
-				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);
-				if (offset < 0) utils.warn("handleMention", 'Mention for "' + tag + '" not found in message string.');
-				if (!mention.id) utils.warn("handleMention", "Mention id should be non-null.");
-				const id = mention.id || 0;
-				const emptyChar = '\u200E';
-				form["body"] = emptyChar + msg.body;
-				form["profile_xmd[" + i + "][offset]"] = offset + 1;
-				form["profile_xmd[" + i + "][length]"] = tag.length;
-				form["profile_xmd[" + i + "][id]"] = id;
-				form["profile_xmd[" + i + "][type]"] = "p";
-			}
-		}
-		const result = await sendContent(form, threadID, isSingleUser, messageAndOTID);
-		if (callback && typeof callback === "function") {
-			callback(null, result);
-		}
-		return result;
-	};
-};
+
+  async function uploadAttachment(attachments) {
+    const uploads = [];
+    for (const att of attachments) {
+      if (!utils.isReadableStream(att)) {
+        throw new Error("Attachment must be a readable stream, got: " + utils.getType(att));
+      }
+      const res = await defaultFuncs.postFormData(
+        "https://upload.facebook.com/ajax/mercury/upload.php",
+        ctx.jar,
+        { upload_1024: att, voice_clip: "true" },
+        {}
+      ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
+      if (res.error) throw new Error("Upload failed: " + JSON.stringify(res));
+      uploads.push(res.payload.metadata[0]);
+    }
+    return uploads;
+  }
+
+  async function getUrl(url) {
+    const res = await defaultFuncs.post(
+      "https://www.facebook.com/message_share_attachment/fromURI/",
+      ctx.jar,
+      { image_height: 960, image_width: 960, uri: url }
+    ).then(utils.parseAndCheckLogin(ctx, defaultFuncs));
+    if (!res || res.error || !res.payload) throw new Error("URL attachment failed: " + JSON.stringify(res));
+    return res.payload;
+  }
+
+  async function sendContent(form, threadID, messageAndOTID) {
+    const tid = String(threadID);
+
+    if (Array.isArray(threadID)) {
+      threadID.forEach((id, idx) => { form[`specific_to_list[${idx}]`] = "fbid:" + id; });
+      form[`specific_to_list[${threadID.length}]`] = "fbid:" + ctx.userID;
+      form["client_thread_id"] = "root:" + messageAndOTID;
+      utils.log("sendMessage", "Creating new group with users: " + threadID.join(', '));
+    } else {
+      // Group thread — works for any digit length (15, 16, 17, 18, 19...)
+      form["thread_fbid"] = tid;
+      utils.log("sendMessage", "Sending to group thread: " + tid);
+    }
+
+    if (ctx.globalOptions.pageID) {
+      form["author"]                         = "fbid:" + ctx.globalOptions.pageID;
+      form["specific_to_list[1]"]            = "fbid:" + ctx.globalOptions.pageID;
+      form["creator_info[creatorID]"]        = ctx.userID;
+      form["creator_info[creatorType]"]      = "direct_admin";
+      form["creator_info[labelType]"]        = "sent_message";
+      form["creator_info[pageID]"]           = ctx.globalOptions.pageID;
+      form["request_user_id"]               = ctx.globalOptions.pageID;
+      form["creator_info[profileURI]"]       = "https://www.facebook.com/profile.php?id=" + ctx.userID;
+    }
+
+    const resData = await defaultFuncs
+      .post("https://www.facebook.com/messaging/send/", ctx.jar, form)
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs));
+
+    if (!resData) throw new Error("Send message failed — no response.");
+    if (resData.error) {
+      if (resData.error === 1545012) {
+        utils.warn("sendMessage", "Error 1545012: You may not be a member of thread " + tid);
+      }
+      throw new Error("Send message error: " + JSON.stringify(resData));
+    }
+
+    return resData.payload.actions.reduce((p, v) => ({
+      threadID  : v.thread_fbid,
+      messageID : v.message_id,
+      timestamp : v.timestamp,
+    }), null);
+  }
+
+  /**
+   * Send a message to a Facebook group thread.
+   *
+   * Supports both callback and Promise/await style:
+   *
+   *   api.sendMessage("Hello!", threadID, callback)          // callback style
+   *   await api.sendMessage("Hello!", threadID)              // promise style
+   *   api.sendMessage("Reply!", threadID, msgID, callback)   // reply + callback
+   *   await api.sendMessage("Reply!", threadID, msgID)       // reply + promise
+   *
+   * @param {string|object}   msg              — text string or {body, sticker, attachment, url, emoji, mentions, location}
+   * @param {string|Array}    threadID         — group thread ID (any length) or array of userIDs to create new group
+   * @param {string|Function} [replyOrCallback]— optional: message ID to reply to, OR callback function(err, info)
+   * @param {Function}        [callback]       — optional: callback(err, info) when replyToMessage is provided
+   */
+  return (msg, threadID, replyOrCallback, callbackArg) => {
+
+    // ── Resolve replyToMessage vs callback ───────────────────────
+    let replyToMessage = null;
+    let callback       = null;
+
+    if (typeof replyOrCallback === 'function') {
+      // sendMessage(msg, threadID, callback)
+      callback = replyOrCallback;
+    } else if (typeof replyOrCallback === 'string') {
+      // sendMessage(msg, threadID, replyMsgID)  or  sendMessage(msg, threadID, replyMsgID, callback)
+      replyToMessage = replyOrCallback;
+      if (typeof callbackArg === 'function') callback = callbackArg;
+    }
+
+    // ── Core send logic (async) ──────────────────────────────────
+    const doSend = async () => {
+      const msgType = utils.getType(msg);
+      if (msgType !== "String" && msgType !== "Object") {
+        throw new Error("Message must be a string or object, got: " + msgType);
+      }
+      if (msgType === "String") msg = { body: msg };
+
+      const disallowed = Object.keys(msg).filter(p => !allowedProperties[p]);
+      if (disallowed.length > 0) {
+        throw new Error("Disallowed message properties: " + disallowed.join(", "));
+      }
+
+      const messageAndOTID = utils.generateOfflineThreadingID();
+      const form = {
+        client                          : "mercury",
+        action_type                     : "ma-type:user-generated-message",
+        author                          : "fbid:" + ctx.userID,
+        timestamp                       : Date.now(),
+        timestamp_absolute              : "Today",
+        timestamp_relative              : utils.generateTimestampRelative(),
+        timestamp_time_passed           : "0",
+        is_unread                       : false,
+        is_cleared                      : false,
+        is_forward                      : false,
+        is_filtered_content             : false,
+        is_filtered_content_bh          : false,
+        is_filtered_content_account     : false,
+        is_filtered_content_quasar      : false,
+        is_filtered_content_invalid_app : false,
+        is_spoof_warning                : false,
+        source                          : "source:chat:web",
+        "source_tags[0]"                : "source:chat",
+        ...(msg.body && { body: msg.body }),
+        html_body                       : false,
+        ui_push_phase                   : "V3",
+        status                          : "0",
+        offline_threading_id            : messageAndOTID,
+        message_id                      : messageAndOTID,
+        threading_id                    : utils.generateThreadingID(ctx.clientID),
+        "ephemeral_ttl_mode:"           : "0",
+        manual_retry_cnt                : "0",
+        has_attachment                  : !!(msg.attachment || msg.url || msg.sticker),
+        signatureID                     : utils.getSignatureID(),
+        ...(replyToMessage && { replied_to_message_id: replyToMessage }),
+      };
+
+      if (msg.location) {
+        if (!msg.location.latitude || !msg.location.longitude) {
+          throw new Error("location needs both latitude and longitude.");
+        }
+        form["location_attachment[coordinates][latitude]"]  = msg.location.latitude;
+        form["location_attachment[coordinates][longitude]"] = msg.location.longitude;
+        form["location_attachment[is_current_location]"]    = !!msg.location.current;
+      }
+
+      if (msg.sticker) form["sticker_id"] = msg.sticker;
+
+      if (msg.attachment) {
+        form.image_ids = []; form.gif_ids = []; form.file_ids = [];
+        form.video_ids = []; form.audio_ids = [];
+        if (utils.getType(msg.attachment) !== "Array") msg.attachment = [msg.attachment];
+        const files = await uploadAttachment(msg.attachment);
+        files.forEach(file => {
+          const type = Object.keys(file)[0];
+          form[type + "s"].push(file[type]);
+        });
+      }
+
+      if (msg.url) {
+        form["shareable_attachment[share_type]"]   = "100";
+        form["shareable_attachment[share_params]"] = await getUrl(msg.url);
+      }
+
+      if (msg.emoji) {
+        if (!msg.emojiSize) msg.emojiSize = "medium";
+        if (!["small","medium","large"].includes(msg.emojiSize)) {
+          throw new Error("emojiSize must be small, medium, or large.");
+        }
+        if (!form.body) throw new Error("body must not be empty when using emoji.");
+        form.body = msg.emoji;
+        form["tags[0]"] = "hot_emoji_size:" + msg.emojiSize;
+      }
+
+      if (msg.mentions) {
+        for (let i = 0; i < msg.mentions.length; i++) {
+          const { tag, id, fromIndex } = msg.mentions[i];
+          if (typeof tag !== "string") throw new Error("Mention tags must be strings.");
+          const offset = msg.body.indexOf(tag, fromIndex || 0);
+          if (offset < 0) utils.warn("sendMessage", `Mention "${tag}" not found in body.`);
+          const emptyChar = '\u200E';
+          form["body"]                              = emptyChar + msg.body;
+          form[`profile_xmd[${i}][offset]`]        = offset + 1;
+          form[`profile_xmd[${i}][length]`]        = tag.length;
+          form[`profile_xmd[${i}][id]`]            = id || 0;
+          form[`profile_xmd[${i}][type]`]          = "p";
+        }
+      }
+
+      return sendContent(form, threadID, messageAndOTID);
+    };
+
+    // ── Return Promise OR call callback ──────────────────────────
+    if (callback) {
+      doSend().then(info => callback(null, info)).catch(err => callback(err));
+    } else {
+      return doSend();
+    }
+  };
+};

package/src/sendTypingIndicator.js

@@ -1,101 +1,45 @@
-"use strict";
-
-const utils = require("../utils");
-// @NethWs3Dev
-
-module.exports = function (defaultFuncs, api, ctx) {
-  function makeTypingIndicator(typ, threadID, callback, isGroup) {
-    const form = {
-      typ: +typ,
-      to: "",
-      source: "mercury-chat",
-      thread: threadID,
-    };
-
-    // Check if thread is a single person chat or a group chat
-    // More info on this is in api.sendMessage
-    if (utils.getType(isGroup) == "Boolean") {
-      if (!isGroup) {
-        form.to = threadID;
-      }
-      defaultFuncs
-        .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
-        .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-        .then(function (resData) {
-          if (resData.error) {
-            throw resData;
-          }
-
-          return callback();
-        })
-        .catch(function (err) {
-          console.error("sendTypingIndicator", err);
-          return callback(err);
-        });
-    } else {
-      api.getUserInfo(threadID, function (err, res) {
-        if (err) {
-          return callback(err);
-        }
-
-        // If id is single person chat
-        if (Object.keys(res).length > 0) {
-          form.to = threadID;
-        }
-
-        defaultFuncs
-          .post(
-            "https://www.facebook.com/ajax/messaging/typ.php",
-            ctx.jar,
-            form,
-          )
-          .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-          .then(function (resData) {
-            if (resData.error) {
-              throw resData;
-            }
-
-            return callback();
-          })
-          .catch(function (err) {
-            console.error("sendTypingIndicator", err);
-            return callback(err);
-          });
-      });
-    }
-  }
-
-  return function sendTypingIndicator(threadID, callback, isGroup) {
-    if (
-      utils.getType(callback) !== "Function" &&
-      utils.getType(callback) !== "AsyncFunction"
-    ) {
-      if (callback) {
-        console.warn(
-          "sendTypingIndicator",
-          "callback is not a function - ignoring.",
-        );
-      }
-      callback = () => {};
-    }
-
-    makeTypingIndicator(true, threadID, callback, isGroup);
-
-    return function end(cb) {
-      if (
-        utils.getType(cb) !== "Function" &&
-        utils.getType(cb) !== "AsyncFunction"
-      ) {
-        if (cb) {
-          console.warn(
-            "sendTypingIndicator",
-            "callback is not a function - ignoring.",
-          );
-        }
-        cb = () => {};
-      }
-
-      makeTypingIndicator(false, threadID, cb, isGroup);
-    };
-  };
-};
+"use strict";
+
+
+
+var utils = require("../utils");
+// @NethWs3Dev
+
+module.exports = function (defaultFuncs, api, ctx) {
+	return async function sendTypingIndicatorV2(sendTyping, threadID, callback) {
+		const mqttClient = ctx.mqttClient || global.mqttClient;
+		if (!mqttClient) {
+			if (typeof callback === 'function') callback(new Error('No MQTT client available for typing indicator'));
+			return;
+		}
+
+		let count_req = 0;
+		var wsContent = {
+			app_id: 2220391788200892,
+			payload: JSON.stringify({
+				label: 3,
+				payload: JSON.stringify({
+					thread_key: threadID.toString(),
+					is_group_thread: +(threadID.toString().length >= 16),
+					is_typing: +sendTyping,
+					attribution: 0
+				}),
+				version: 5849951561777440
+			}),
+			request_id: ++count_req,
+			type: 4
+		};
+
+		return new Promise((resolve, reject) => {
+			mqttClient.publish('/ls_req', JSON.stringify(wsContent), {}, (err, _packet) => {
+				if (err) {
+					if (typeof callback === 'function') callback(err);
+					reject(err);
+				} else {
+					if (typeof callback === 'function') callback(null, _packet);
+					resolve(_packet);
+				}
+			});
+		});
+	};
+};