stfca 1.0.22 → 1.0.24

package/index.js

@@ -192,13 +192,83 @@ function buildAPI(globalOptions, html, jar) {
     };
     let config = { enableTypingIndicator: false, typingDuration: 4000 };
     try {
-        const configPath = path.join(__dirname, 'config.json');
-        if (fs.existsSync(configPath)) {
-            config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        // Prefer global root config (project-level), but fallback to fca/config.json if present.
+        const rootConfigPath = path.join(process.cwd(), 'config.json');
+        if (fs.existsSync(rootConfigPath)) {
+            const rootConfig = JSON.parse(fs.readFileSync(rootConfigPath, 'utf8'));
+            if (rootConfig && typeof rootConfig === 'object') {
+                if (typeof rootConfig.enableTypingIndicator !== 'undefined') config.enableTypingIndicator = rootConfig.enableTypingIndicator;
+                if (typeof rootConfig.typingDuration !== 'undefined') config.typingDuration = rootConfig.typingDuration;
+            }
+        }
+
+        const fcaConfigPath = path.join(__dirname, 'config.json');
+        if (fs.existsSync(fcaConfigPath)) {
+            const fcaConfig = JSON.parse(fs.readFileSync(fcaConfigPath, 'utf8'));
+            if (fcaConfig && typeof fcaConfig === 'object') {
+                if (typeof fcaConfig.enableTypingIndicator !== 'undefined') config.enableTypingIndicator = fcaConfig.enableTypingIndicator;
+                if (typeof fcaConfig.typingDuration !== 'undefined') config.typingDuration = fcaConfig.typingDuration;
+            }
+        }
+
+        if (global.GoatBot && global.GoatBot.config) {
+            if (typeof global.GoatBot.config.enableTypingIndicator !== 'undefined') config.enableTypingIndicator = global.GoatBot.config.enableTypingIndicator;
+            if (typeof global.GoatBot.config.typingDuration !== 'undefined') config.typingDuration = global.GoatBot.config.typingDuration;
         }
     } catch (e) {
         console.log('Error loading config.json:', e);
     }
+
+    const refreshFcaConfig = () => {
+        try {
+            // Defaults first
+            const updatedConfig = { enableTypingIndicator: false, typingDuration: 4000 };
+
+            // Layered config sources
+            if (fs.existsSync(path.join(process.cwd(), 'config.json'))) {
+                const rootConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'config.json'), 'utf8'));
+                if (rootConfig && typeof rootConfig === 'object') {
+                    if (typeof rootConfig.enableTypingIndicator !== 'undefined') updatedConfig.enableTypingIndicator = rootConfig.enableTypingIndicator;
+                    if (typeof rootConfig.typingDuration !== 'undefined') updatedConfig.typingDuration = rootConfig.typingDuration;
+                }
+            }
+
+            if (fs.existsSync(path.join(__dirname, 'config.json'))) {
+                const fcaConfig = JSON.parse(fs.readFileSync(path.join(__dirname, 'config.json'), 'utf8'));
+                if (fcaConfig && typeof fcaConfig === 'object') {
+                    if (typeof fcaConfig.enableTypingIndicator !== 'undefined') updatedConfig.enableTypingIndicator = fcaConfig.enableTypingIndicator;
+                    if (typeof fcaConfig.typingDuration !== 'undefined') updatedConfig.typingDuration = fcaConfig.typingDuration;
+                }
+            }
+
+            if (global.GoatBot && global.GoatBot.config) {
+                if (typeof global.GoatBot.config.enableTypingIndicator !== 'undefined') updatedConfig.enableTypingIndicator = global.GoatBot.config.enableTypingIndicator;
+                if (typeof global.GoatBot.config.typingDuration !== 'undefined') updatedConfig.typingDuration = global.GoatBot.config.typingDuration;
+            }
+
+            ctx.config = updatedConfig;
+            config = updatedConfig;
+            if (global.GoatBot) global.GoatBot.config = global.GoatBot.config || {};
+            if (global.GoatBot && typeof global.GoatBot.config.enableTypingIndicator !== 'undefined') {
+                global.GoatBot.config.enableTypingIndicator = updatedConfig.enableTypingIndicator;
+            }
+            if (global.GoatBot && typeof global.GoatBot.config.typingDuration !== 'undefined') {
+                global.GoatBot.config.typingDuration = updatedConfig.typingDuration;
+            }
+        } catch (e) {
+            console.log('Failed to refresh fca config:', e);
+        }
+    };
+
+    // Initial config load
+    refreshFcaConfig();
+
+    // Accessible runtime API for config reload
+    ctx.refreshFcaConfig = refreshFcaConfig;
+    if (global.GoatBot) {
+        global.GoatBot.refreshFcaConfig = refreshFcaConfig;
+    }
+
     ctx.config = config;
     var api = {
         setOptions: setOptions.bind(null, globalOptions),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stfca",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "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

@@ -311,11 +311,15 @@ module.exports = function (defaultFuncs, api, ctx) {
     };
     // console.log(form)
 
-    if (isSingleUser && ctx.config.enableTypingIndicator) {
-        api.sendTypingIndicatorV2(true, threadID, () => {});
+    const configSource = (global.GoatBot && global.GoatBot.config) ? global.GoatBot.config : ctx.config || {};
+    const enableTypingIndicator = typeof configSource.enableTypingIndicator !== 'undefined' ? configSource.enableTypingIndicator : ctx.config?.enableTypingIndicator;
+    const typingDuration = Number(configSource.typingDuration || ctx.config?.typingDuration || 4000);
+
+    if (enableTypingIndicator) {
+        api.sendTypingIndicator(true, threadID, () => {});
         const originalCallback = callback;
         callback = (err, data) => {
-            api.sendTypingIndicatorV2(false, threadID, () => {});
+            api.sendTypingIndicator(false, threadID, () => {});
             originalCallback(err, data);
         };
         setTimeout(() => {
@@ -332,7 +336,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                 )
               )
             );
-        }, ctx.config.typingDuration);
+        }, typingDuration);
     } else {
         handleLocation(msg, form, callback, () =>
           handleSticker(msg, form, callback, () =>

package/src/sendMessage.js

@@ -234,11 +234,15 @@ module.exports = (defaultFuncs, api, ctx) => {
 				form["profile_xmd[" + i + "][type]"] = "p";
 			}
 		}
-		if (isSingleUser && ctx.config.enableTypingIndicator) {
-			await api.sendTypingIndicatorV2(true, threadID, () => {});
-			await utils.delay(ctx.config.typingDuration);
+		const configSource = (global.GoatBot && global.GoatBot.config) ? global.GoatBot.config : ctx.config || {};
+		const enableTypingIndicator = typeof configSource.enableTypingIndicator !== 'undefined' ? configSource.enableTypingIndicator : ctx.config?.enableTypingIndicator;
+		const typingDuration = Number(configSource.typingDuration || ctx.config?.typingDuration || 4000);
+
+		if (enableTypingIndicator) {
+			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/src/sendTypingIndicatorV2.js

@@ -1,28 +0,0 @@
-"use strict";
-
-
-
-var utils = require("../utils");
-// @NethWs3Dev
-
-module.exports = function (defaultFuncs, api, ctx) {
-	return async function sendTypingIndicatorV2(sendTyping,threadID, callback) {
-		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
-		};
-			await new Promise((resolve, reject) => mqttClient.publish('/ls_req', JSON.stringify(wsContent), {}, (err, _packet) => err ? reject(err) : resolve()));
-	};
-};