stfca 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stfca",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "Unofficial Facebook Chat API for Node.js with Auto-Update System - Enhanced by ST | Sheikh Tamim",
   "main": "index.js",
   "files": [

package/src/OldMessage.js

@@ -316,10 +316,10 @@ module.exports = function (defaultFuncs, api, ctx) {
     const typingDuration = Number(configSource.typingDuration || ctx.config?.typingDuration || 4000);
 
     if (enableTypingIndicator) {
-        api.sendTypingIndicatorV2(true, threadID, () => {});
+        api.sendTypingIndicator(true, threadID, () => {});
         const originalCallback = callback;
         callback = (err, data) => {
-            api.sendTypingIndicatorV2(false, threadID, () => {});
+            api.sendTypingIndicator(false, threadID, () => {});
             originalCallback(err, data);
         };
         setTimeout(() => {

package/src/sendMessage.js

@@ -239,10 +239,10 @@ module.exports = (defaultFuncs, api, ctx) => {
 		const typingDuration = Number(configSource.typingDuration || ctx.config?.typingDuration || 4000);
 
 		if (enableTypingIndicator) {
-			await api.sendTypingIndicatorV2(true, threadID, () => {});
+			await api.sendTypingIndicator(true, threadID, () => {});
 			await utils.delay(typingDuration);
 			const result = await sendContent(form, threadID, isSingleUser, messageAndOTID);
-			await api.sendTypingIndicatorV2(false, threadID, () => {});
+			await api.sendTypingIndicator(false, threadID, () => {});
 			if (callback && typeof callback === "function") {
 				callback(null, result);
 			}

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);
+				}
+			});
+		});
+	};
+};

package/utils.js

@@ -724,14 +724,41 @@ function formatAttachment(attachments, attachmentIds, attachmentMap, shareMap) {
 
 function formatDeltaMessage(m) {
     var md = m.delta.messageMetadata;
-    var mdata = m.delta.data === undefined ? [] : m.delta.data.prng === undefined ? [] : JSON.parse(m.delta.data.prng);
-    var m_id = mdata.map(u => u.i);
-    var m_offset = mdata.map(u => u.o);
-    var m_length = mdata.map(u => u.l);
-    var mentions = {};
     var body = m.delta.body || "";
     var args = body == "" ? [] : body.trim().split(/\s+/);
-    for (var i = 0; i < m_id.length; i++) mentions[m_id[i]] = m.delta.body.substring(m_offset[i], m_offset[i] + m_length[i]);
+    var mentions = {};
+    var mdata = [];
+    if (m.delta.data && m.delta.data.prng) {
+        try {
+            mdata = JSON.parse(m.delta.data.prng);
+        } catch (e) {
+            mdata = [];
+        }
+    }
+    if (mdata.length > 0) {
+        for (var i = 0; i < mdata.length; i++) {
+            var _id = String(mdata[i].i);
+            var _o = parseInt(mdata[i].o, 10) || 0;
+            var _l = parseInt(mdata[i].l, 10) || 0;
+            mentions[_id] = body.substring(_o, _o + _l);
+        }
+    } else if (
+        md && md.data && md.data.data && md.data.data.Gb &&
+        md.data.data.Gb.asMap && md.data.data.Gb.asMap.data
+    ) {
+        var gbData = md.data.data.Gb.asMap.data;
+        for (var key in gbData) {
+            if (!Object.prototype.hasOwnProperty.call(gbData, key)) continue;
+            var entry = gbData[key];
+            if (entry && entry.asMap && entry.asMap.data) {
+                var d = entry.asMap.data;
+                var _gid = d.id && d.id.asLong ? String(d.id.asLong) : null;
+                var _go = parseInt(d.offset && d.offset.asLong ? d.offset.asLong : 0, 10);
+                var _gl = parseInt(d.length && d.length.asLong ? d.length.asLong : 0, 10);
+                if (_gid != null) mentions[_gid] = body.substring(_go, _go + _gl);
+            }
+        }
+    }
 
     // Determine if this is a DM or group
     const otherUserFbId = md.threadKey.otherUserFbId;

package/src/sendTypingIndicatorV2.js

@@ -1,45 +0,0 @@
-"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);
-				}
-			});
-		});
-	};
-};