rapido-fca 0.0.3 → 0.0.5

package/index.js

@@ -3,9 +3,6 @@
 var utils = require("./utils");
 var cheerio = require("cheerio");
 var log = require("npmlog");
-/*var { getThemeColors } = require("../../func/utils/log.js");
-var logger = require("../../func/utils/log.js");
-var { cra, cv, cb, co } = getThemeColors();*/
 log.maxRecordSize = 100;
 var checkVerified = null;
 const Boolean_Option = ['online', 'selfListen', 'listenEvents', 'updatePresence', 'forceLogin', 'autoMarkDelivery', 'autoMarkRead', 'listenTyping', 'autoReconnect', 'emitReady'];
@@ -114,10 +111,10 @@ function buildAPI(globalOptions, html, jar) {
                 }
             } catch { }
             if (fb_dtsg) {
-                console.log("Found fb_dtsg!");
+                log.info("Login", "Found fb_dtsg token");
             }
         } catch (e) {
-            console.log("Error finding fb_dtsg:", e);
+            log.error("Login", "Error finding fb_dtsg token");
         }
     }
     extractFromHTML();
@@ -126,33 +123,33 @@ function buildAPI(globalOptions, html, jar) {
     var userCookie = cookies.find(cookie => cookie.cookieString().startsWith("c_user="));
     var tiktikCookie = cookies.find(cookie => cookie.cookieString().startsWith("i_user="));
     if (!userCookie && !tiktikCookie) {
-        return log.error("Error! Your cookiestate is not valid!");
+        return log.error("Login", "Invalid cookie state");
     }
     if (html.includes("/checkpoint/block/?next")) {
-        return log.error('error', "Appstate is dead rechange it!", 'error');
+        return log.error('Login', "Appstate is blocked - please renew it");
     }
     userID = (tiktikCookie || userCookie).cookieString().split("=")[1];
-    //logger.log(`${cra(`[ CONNECT ]`)} Logged in as ${userID}`, "DATABASE");
+    log.info("Login", `User ID: ${api.getCurrentUserID()}`);
     try { clearInterval(checkVerified); } catch (_) { }
     const clientID = (Math.random() * 2147483648 | 0).toString(16);
-    let mqttEndpoint = `wss://edge-chat.facebook.com/chat?region=prn&sid=${userID}`;
-    let region = "PRN";
+    let mqttEndpoint = `wss://edge-chat.facebook.com/chat?region=pnb&sid=${userID}`;
+    let region = "PNB";
 
     try {
         const endpointMatch = html.match(/"endpoint":"([^"]+)"/);
         if (endpointMatch.input.includes("601051028565049")) {
-          console.log(`login error.`);
-          ditconmemay = true;
+            log.error("Login", "Login error detected");
+            ditconmemay = true;
         }
         if (endpointMatch) {
             mqttEndpoint = endpointMatch[1].replace(/\\\//g, '/');
             const url = new URL(mqttEndpoint);
-            region = url.searchParams.get('region')?.toUpperCase() || "PRN";
+            region = url.searchParams.get('region')?.toUpperCase() || "PNB";
         }
     } catch (e) {
-        console.log('Using default MQTT endpoint');
+        log.warn("Login", "Using default MQTT endpoint");
     }
-    log.info('Logging in...');
+    log.info("Login", `Connecting to region: ${region}`);
     var ctx = {
         userID: userID,
         jar: jar,
@@ -214,11 +211,10 @@ function buildAPI(globalOptions, html, jar) {
 
             return newDtsg;
         } catch (e) {
-            console.log("Error getting fresh dtsg:", e);
+            log.error("Login", "Error getting fresh dtsg token");
             return null;
         }
     };
-    //if (noMqttData) api.htmlData = noMqttData;
     require('fs').readdirSync(__dirname + '/src/').filter(v => v.endsWith('.js')).forEach(v => { api[v.replace('.js', '')] = require(`./src/${v}`)(utils.makeDefaults(html, userID, ctx), api, ctx); });
     api.listen = api.listenMqtt;
     return {
@@ -251,7 +247,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                 const cookieData = JSON.parse("[\"" + utils.getFrom(val, "", "]") + "]");
                 jar.setCookie(utils.formatCookie(cookieData, "facebook"), "https://www.facebook.com");
             });
-            log.info("Logging in...");
+            log.info("Login", "Attempting login...");
             const loginRes = await utils.post(
                 "https://www.facebook.com/login/device-based/regular/login/?login_attempt=1&lwv=110",
                 jar,
@@ -262,7 +258,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
             const headers = loginRes.headers;
             if (!headers.location) throw new Error("Wrong username/password.");
             if (headers.location.includes('https://www.facebook.com/checkpoint/')) {
-                log.info("login", "You have login approvals turned on.");
+                log.info("Login", "Login approvals enabled");
                 const checkpointRes = await utils.get(headers.location, jar, null, loginOptions);
                 await utils.saveCookies(jar)(checkpointRes);
                 const checkpointHtml = checkpointRes.body;
@@ -322,7 +318,6 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
     };
 }
 
-
 function loginHelper(appState, email, password, globalOptions, callback, prCallback) {
     let mainPromise = null;
     const jar = utils.getJar();
@@ -397,7 +392,7 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
     mainPromise
         .then(async () => {
-            log.info('Login successful');
+            log.info("Login", `Successfully logged in as ${ctx.userID} in region ${ctx.region}`);
             callback(null, api);
         })
         .catch(e => {
@@ -405,7 +400,6 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
         });
 }
 
-
 function login(loginData, options, callback) {
     if (utils.getType(options) === 'Function' || utils.getType(options) === 'AsyncFunction') {
         callback = options;
@@ -456,5 +450,4 @@ function login(loginData, options, callback) {
     return returnPromise;
 }
 
-
 module.exports = login;

package/package.json

@@ -1,18 +1,7 @@
 {
     "name": "rapido-fca",
-    "version": "0.0.3",
+    "version": "0.0.5",
     "description": "A Facebook chat api for messenger bots.",
-    "main": "index.js",
-    "scripts": {
-        "start": "node index.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": ""
-    },
-    "author": "rapidodev",
-    "license": "MIT",
-    "homepage": "",
     "keywords": [
         "facebook",
         "chat",
@@ -21,6 +10,21 @@
         "messenger",
         "chatbot"
     ],
+    "homepage": "",
+    "repository": {
+        "type": "git",
+        "url": ""
+    },
+    "license": "MIT",
+    "author": "rapidodev",
+    "type": "commonjs",
+    "main": "index.js",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "start": "node index.js"
+    },
     "dependencies": {
         "axios": "^1.6.5",
         "bluebird": "^3.7.2",
@@ -39,8 +43,5 @@
     },
     "engines": {
         "node": ">=10.x"
-    },
-    "directories": {
-        "test": "test"
     }
 }

package/src/addExternalModule.js

@@ -1,29 +1,25 @@
 "use strict";
 
 const utils = require("../utils");
-const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
-	return function addExternalModule(moduleObj) {
-		if (utils.getType(moduleObj) == "Object") {
-			for (const apiName in moduleObj) {
-				if (utils.getType(moduleObj[apiName]) == "Function") {
-					api[apiName] = moduleObj[apiName](defaultFuncs, api, ctx, utils, log);
-				} else {
-					throw new Error(`Item "${apiName}" in moduleObj must be a function, not ${utils.getType(moduleObj[apiName])}!`);
-				}
-			}
-		} else {
-			throw new Error(`moduleObj must be an object, not ${utils.getType(moduleObj)}!`);
-		}
-	};
+  return function addExternalModule(moduleObj) {
+    if (utils.getType(moduleObj) == "Object") {
+      for (const apiName in moduleObj) {
+        if (utils.getType(moduleObj[apiName]) == "Function") {
+          api[apiName] = moduleObj[apiName](defaultFuncs, api, ctx);
+        } else {
+          throw new Error(
+            `Item "${apiName}" in moduleObj must be a function, not ${utils.getType(
+              moduleObj[apiName],
+            )}!`,
+          );
+        }
+      }
+    } else {
+      throw new Error(
+        `moduleObj must be an object, not ${utils.getType(moduleObj)}!`,
+      );
+    }
+  };
 };
-
-// example usage:
-// api.addExternalModule({
-// 	getCtx: (defaultFuncs, api, ctx, utils, log) => {
-// 		return function getCtx() {
-// 			return ctx;
-// 		};
-// 	}
-// });

package/src/addUserToGroup.js

@@ -1,113 +1,115 @@
 "use strict";
 
 const utils = require("../utils");
-const log = require("npmlog");
+// @NethWs3Dev
 
 module.exports = function (defaultFuncs, api, ctx) {
-	return function addUserToGroup(userID, threadID, callback) {
-		let resolveFunc = function () { };
-		let rejectFunc = function () { };
-		const returnPromise = new Promise(function (resolve, reject) {
-			resolveFunc = resolve;
-			rejectFunc = reject;
-		});
+  return function addUserToGroup(userID, threadID, callback) {
+    let resolveFunc = function () {};
+    let rejectFunc = function () {};
+    const returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
 
-		if (
-			!callback &&
-			(utils.getType(threadID) === "Function" ||
-				utils.getType(threadID) === "AsyncFunction")
-		) {
-			throw new utils.CustomError({ error: "please pass a threadID as a second argument." });
-		}
+    if (
+      !callback &&
+      (utils.getType(threadID) === "Function" ||
+        utils.getType(threadID) === "AsyncFunction")
+    ) {
+      throw new utils.CustomError({
+        error: "please pass a threadID as a second argument.",
+      });
+    }
 
-		if (!callback) {
-			callback = function (err) {
-				if (err) {
-					return rejectFunc(err);
-				}
-				resolveFunc();
-			};
-		}
+    if (!callback) {
+      callback = function (err) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc();
+      };
+    }
 
-		if (
-			utils.getType(threadID) !== "Number" &&
-			utils.getType(threadID) !== "String"
-		) {
-			throw new utils.CustomError({
-				error:
-					"ThreadID should be of type Number or String and not " +
-					utils.getType(threadID) +
-					"."
-			});
-		}
+    if (
+      utils.getType(threadID) !== "Number" &&
+      utils.getType(threadID) !== "String"
+    ) {
+      throw new utils.CustomError({
+        error:
+          "ThreadID should be of type Number or String and not " +
+          utils.getType(threadID) +
+          ".",
+      });
+    }
 
-		if (utils.getType(userID) !== "Array") {
-			userID = [userID];
-		}
+    if (utils.getType(userID) !== "Array") {
+      userID = [userID];
+    }
 
-		const messageAndOTID = utils.generateOfflineThreadingID();
-		const form = {
-			client: "mercury",
-			action_type: "ma-type:log-message",
-			author: "fbid:" + (ctx.i_userID || ctx.userID),
-			thread_id: "",
-			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_spoof_warning: false,
-			source: "source:chat:web",
-			"source_tags[0]": "source:chat",
-			log_message_type: "log:subscribe",
-			status: "0",
-			offline_threading_id: messageAndOTID,
-			message_id: messageAndOTID,
-			threading_id: utils.generateThreadingID(ctx.clientID),
-			manual_retry_cnt: "0",
-			thread_fbid: threadID
-		};
+    const messageAndOTID = utils.generateOfflineThreadingID();
+    const form = {
+      client: "mercury",
+      action_type: "ma-type:log-message",
+      author: "fbid:" + (ctx.userID),
+      thread_id: "",
+      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_spoof_warning: false,
+      source: "source:chat:web",
+      "source_tags[0]": "source:chat",
+      log_message_type: "log:subscribe",
+      status: "0",
+      offline_threading_id: messageAndOTID,
+      message_id: messageAndOTID,
+      threading_id: utils.generateThreadingID(ctx.clientID),
+      manual_retry_cnt: "0",
+      thread_fbid: threadID,
+    };
 
-		for (let i = 0; i < userID.length; i++) {
-			if (
-				utils.getType(userID[i]) !== "Number" &&
-				utils.getType(userID[i]) !== "String"
-			) {
-				throw new utils.CustomError({
-					error:
-						"Elements of userID should be of type Number or String and not " +
-						utils.getType(userID[i]) +
-						"."
-				});
-			}
+    for (let i = 0; i < userID.length; i++) {
+      if (
+        utils.getType(userID[i]) !== "Number" &&
+        utils.getType(userID[i]) !== "String"
+      ) {
+        throw new utils.CustomError({
+          error:
+            "Elements of userID should be of type Number or String and not " +
+            utils.getType(userID[i]) +
+            ".",
+        });
+      }
 
-			form["log_message_data[added_participants][" + i + "]"] =
-				"fbid:" + userID[i];
-		}
+      form["log_message_data[added_participants][" + i + "]"] =
+        "fbid:" + userID[i];
+    }
 
-		defaultFuncs
-			.post("https://www.facebook.com/messaging/send/", ctx.jar, form)
-			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-			.then(function (resData) {
-				if (!resData) {
-					throw new utils.CustomError({ error: "Add to group failed." });
-				}
-				if (resData.error) {
-					throw new utils.CustomError(resData);
-				}
+    defaultFuncs
+      .post("https://www.facebook.com/messaging/send/", ctx.jar, form)
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (!resData) {
+          throw new utils.CustomError({ error: "Add to group failed." });
+        }
+        if (resData.error) {
+          throw new utils.CustomError(resData);
+        }
 
-				return callback();
-			})
-			.catch(function (err) {
-				log.error("addUserToGroup", err);
-				return callback(err);
-			});
+        return callback();
+      })
+      .catch(function (err) {
+        console.error("addUserToGroup", err);
+        return callback(err);
+      });
 
-		return returnPromise;
-	};
+    return returnPromise;
+  };
 };

package/src/changeAdminStatus.js

@@ -1,79 +1,103 @@
 "use strict";
 
 const utils = require("../utils");
-const log = require("npmlog");
+// @NethWs3Dev
 
 module.exports = function (defaultFuncs, api, ctx) {
-	return function changeAdminStatus(threadID, adminIDs, adminStatus, callback) {
-		if (utils.getType(threadID) !== "String") {
-			throw new utils.CustomError({ error: "changeAdminStatus: threadID must be a string" });
-		}
+  return function changeAdminStatus(threadID, adminIDs, adminStatus, callback) {
+    if (utils.getType(threadID) !== "String") {
+      throw new utils.CustomError({
+        error: "changeAdminStatus: threadID must be a string",
+      });
+    }
 
-		if (utils.getType(adminIDs) === "String") {
-			adminIDs = [adminIDs];
-		}
+    if (utils.getType(adminIDs) === "String") {
+      adminIDs = [adminIDs];
+    }
 
-		if (utils.getType(adminIDs) !== "Array") {
-			throw new utils.CustomError({ error: "changeAdminStatus: adminIDs must be an array or string" });
-		}
+    if (utils.getType(adminIDs) !== "Array") {
+      throw new utils.CustomError({
+        error: "changeAdminStatus: adminIDs must be an array or string",
+      });
+    }
 
-		if (utils.getType(adminStatus) !== "Boolean") {
-			throw new utils.CustomError({ error: "changeAdminStatus: adminStatus must be a string" });
-		}
+    if (utils.getType(adminStatus) !== "Boolean") {
+      throw new utils.CustomError({
+        error: "changeAdminStatus: adminStatus must be a string",
+      });
+    }
 
-		let resolveFunc = function () { };
-		let rejectFunc = function () { };
-		const returnPromise = new Promise(function (resolve, reject) {
-			resolveFunc = resolve;
-			rejectFunc = reject;
-		});
+    let resolveFunc = function () {};
+    let rejectFunc = function () {};
+    const returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
 
-		if (!callback) {
-			callback = function (err) {
-				if (err) {
-					return rejectFunc(err);
-				}
-				resolveFunc();
-			};
-		}
+    if (!callback) {
+      callback = function (err) {
+        if (err) {
+          return rejectFunc(err);
+        }
+        resolveFunc();
+      };
+    }
 
-		if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
-			throw new utils.CustomError({ error: "changeAdminStatus: callback is not a function" });
-		}
+    if (
+      utils.getType(callback) !== "Function" &&
+      utils.getType(callback) !== "AsyncFunction"
+    ) {
+      throw new utils.CustomError({
+        error: "changeAdminStatus: callback is not a function",
+      });
+    }
 
-		const form = {
-			"thread_fbid": threadID
-		};
+    const form = {
+      thread_fbid: threadID,
+    };
 
-		let i = 0;
-		for (const u of adminIDs) {
-			form[`admin_ids[${i++}]`] = u;
-		}
-		form["add"] = adminStatus;
+    let i = 0;
+    for (const u of adminIDs) {
+      form[`admin_ids[${i++}]`] = u;
+    }
+    form["add"] = adminStatus;
 
-		defaultFuncs
-			.post("https://www.facebook.com/messaging/save_admins/?dpr=1", ctx.jar, form)
-			.then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-			.then(function (resData) {
-				if (resData.error) {
-					switch (resData.error) {
-						case 1976004:
-							throw new utils.CustomError({ error: "Cannot alter admin status: you are not an admin.", rawResponse: resData });
-						case 1357031:
-							throw new utils.CustomError({ error: "Cannot alter admin status: this thread is not a group chat.", rawResponse: resData });
-						default:
-							throw new utils.CustomError({ error: "Cannot alter admin status: unknown error.", rawResponse: resData });
-					}
-				}
+    defaultFuncs
+      .post(
+        "https://www.facebook.com/messaging/save_admins/?dpr=1",
+        ctx.jar,
+        form,
+      )
+      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (resData.error) {
+          switch (resData.error) {
+            case 1976004:
+              throw new utils.CustomError({
+                error: "Cannot alter admin status: you are not an admin.",
+                rawResponse: resData,
+              });
+            case 1357031:
+              throw new utils.CustomError({
+                error:
+                  "Cannot alter admin status: this thread is not a group chat.",
+                rawResponse: resData,
+              });
+            default:
+              throw new utils.CustomError({
+                error: "Cannot alter admin status: unknown error.",
+                rawResponse: resData,
+              });
+          }
+        }
 
-				callback();
-			})
-			.catch(function (err) {
-				log.error("changeAdminStatus", err);
-				return callback(err);
-			});
+        callback();
+      })
+      .catch(function (err) {
+        console.error("changeAdminStatus", err);
+        return callback(err);
+      });
 
-		return returnPromise;
-	};
+    return returnPromise;
+  };
 };
-