naughty-fb-chatify 1.0.1 → 1.0.2

package/index.js

@@ -12,8 +12,9 @@ console.log(`┌─────────────────────
 │                                                                                │
 │                                                                                │
 │                                                            naughty-fb-chatify  │
-│                                                            Version: 1.0.1      │
+│                                                            Version: 1.0.3      │
 └────────────────────────────────────────────────────────────────────────────────┘`);
+const chalk = require("chalk");
 var utils = require("./utils");
 var cheerio = require("cheerio");
 var log = require("npmlog");
@@ -80,7 +81,7 @@ function setOptions(globalOptions, options) {
         globalOptions.emitReady = Boolean(options.emitReady);
         break;
       default:
-        log.warn("setOptions", "Unrecognized option given to setOptions: " + key);
+         console.log(`${chalk.bold.yellowBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Unrecognized option given to setOptions:`)} ${chalk.bold.redBright(`${key}`)}`);
         break;
     }
   });
@@ -92,15 +93,16 @@ function buildAPI(globalOptions, html, jar) {
   });
 
   if (maybeCookie.length === 0) {
-    throw { error: "Error retrieving userID. This can be caused by a lot of things, including getting blocked by Facebook for logging in from an unknown location. Try logging in with a browser to verify." };
+     console.log(`${chalk.bold.redBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Error retrieving userID. This can be caused by a lot of things, including getting blocked by Facebook for logging in from an unknown location. Try logging in with a browser to verify.`)}`); 
+    return null;
   }
 
   if (html.indexOf("/checkpoint/block/?next") > -1) {
-    log.warn("login", "Checkpoint detected. Please log in with a browser to verify.");
+    console.log(`${chalk.bold.red(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Checkpoint detected. Please log in with a browser to verify.`)}`)
   }
 
   var userID = maybeCookie[0].cookieString().split("=")[1].toString();
-  log.info("login", `Logged in as ${userID}`);
+  console.log(`${chalk.bold.cyan(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Sucesfully Logged In As`)} ${chalk.bold.redBright(`${userID}`)}`)
 
   try {
     clearInterval(checkVerified);
@@ -119,24 +121,24 @@ function buildAPI(globalOptions, html, jar) {
     irisSeqID = oldFBMQTTMatch[1];
     mqttEndpoint = oldFBMQTTMatch[2];
     region = new URL(mqttEndpoint).searchParams.get("region").toUpperCase();
-    log.info("login", `Got this account's message region: ${region}`);
+    console.log(`${chalk.bold.cyan(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Got this account's message region:`)} ${chalk.bold.redBright(`${region}`)}`);
   } else {
     let newFBMQTTMatch = html.match(/{"app_id":"219994525426954","endpoint":"(.+?)","iris_seq_id":"(.+?)"}/);
     if (newFBMQTTMatch) {
       irisSeqID = newFBMQTTMatch[2];
       mqttEndpoint = newFBMQTTMatch[1].replace(/\\\//g, "/");
       region = new URL(mqttEndpoint).searchParams.get("region").toUpperCase();
-      log.info("login", `Got this account's message region: ${region}`);
+      console.log(`${chalk.bold.cyan(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Got this account's message region:`)} ${chalk.bold.redBright(`${region}`)}`);
     } else {
       let legacyFBMQTTMatch = html.match(/(\["MqttWebConfig",\[\],{fbid:")(.+?)(",appID:219994525426954,endpoint:")(.+?)(",pollingEndpoint:")(.+?)(3790])/);
       if (legacyFBMQTTMatch) {
         mqttEndpoint = legacyFBMQTTMatch[4];
         region = new URL(mqttEndpoint).searchParams.get("region").toUpperCase();
-        log.warn("login", `Cannot get sequence ID with new RegExp. Fallback to old RegExp (without seqID)...`);
-        log.info("login", `Got this account's message region: ${region}`);
-        log.info("login", `[Unused] Polling endpoint: ${legacyFBMQTTMatch[6]}`);
+         console.log(`${chalk.bold.yellowBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Cannot get sequence ID with new RegExp. Fallback to old RegExp (without seqID)...`)}`);
+        console.log(`${chalk.bold.cyan(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`Got this account's message region:`)} ${chalk.bold.redBright(`${region}`)}`);
+        console.log(`${chalk.bold.cyan(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.greenBright(`[Unused] Polling endpoint:`)} ${chalk.bold.redBright(`${legacyFBMQTTMatch[6]}`)}`);
       } else {
-        log.warn("login", "Cannot get MQTT region & sequence ID.");
+        console.log(`${chalk.bold.yellowBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.cyanBright(`Cannot get MQTT region & sequence ID.`)}`);
         noMqttData = html;
       }
     }
@@ -280,19 +282,20 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
     });
     // ---------- Very Hacky Part Ends -----------------
 
-    log.info("login", "Logging in...");
+     console.log(`${chalk.bold.magentaBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.cyanBright(`Logging In....`)}`);
     return utils
       .post("https://www.facebook.com/login/device-based/regular/login/?login_attempt=1&lwv=110", jar, form, loginOptions)
       .then(utils.saveCookies(jar))
       .then(function (res) {
         var headers = res.headers;
         if (!headers.location) {
-          throw { error: "Wrong username/password." };
+           console.log(`${chalk.bold.redBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.yellowBright(`Your UserName or Password Is Incorrect`)}`); 
+          return null;
         }
 
         // This means the account has login approvals turned on.
         if (headers.location.indexOf('https://www.facebook.com/checkpoint/') > -1) {
-          log.info("login", "You have login approvals turned on.");
+          console.log(`${chalk.bold.redBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.yellowBright(`You have login approvals turned on`)}`); 
           var nextURL = 'https://www.facebook.com/checkpoint/?next=https%3A%2F%2Fwww.facebook.com%2Fhome.php';
 
           return utils
@@ -325,7 +328,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                           JSON.parse(res.body.replace(/for\s*\(\s*;\s*;\s*\)\s*;\s*()/, ""));
                         } catch (ex) {
                           clearInterval(checkVerified);
-                          log.info("login", "Verified from browser. Logging in...");
+console.log(`${chalk.bold.magentaBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.cyanBright(`Verified from browser, Logging in...`)}`);
                           return loginHelper(utils.getAppState(jar), email, password, loginOptions, callback);
                         }
                       })
@@ -415,7 +418,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                             JSON.parse(res.body.replace(/for\s*\(\s*;\s*;\s*\)\s*;\s*/, ""));
                           } catch (ex) {
                             clearInterval(checkVerified);
-                            log.info("login", "Verified from browser. Logging in...");
+                            console.log(`${chalk.bold.magentaBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.cyanBright(`Verified from browser, Logging in...`)}`);
                             if (callback === prCallback) {
                               callback = function (err, api) {
                                 if (err) {
@@ -441,7 +444,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                 };
               } else {
                 if (!loginOptions.forceLogin) {
-                  throw { error: "Couldn't login. Facebook might have blocked this account. Please login with a browser or enable the option 'forceLogin' and try again." };
+                 console.log(`${chalk.bold.redBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.yellowBright(`Couldn't login. Facebook might have blocked this account. Please login with a browser or enable the option 'forceLogin' and try again.`)}`); 
                 }
                 if (html.indexOf("Suspicious Login Attempt") > -1) {
                   form['submit[This was me]'] = "This was me";
@@ -464,7 +467,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                     var headers = res.headers;
 
                     if (!headers.location && res.body.indexOf('Review Recent Login') > -1) {
-                      throw { error: "Something went wrong with review recent login." };
+                       console.log(`${chalk.bold.redBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.yellowBright(`Something went wrong with review recent login.`)}`); 
                     }
 
                     var appState = utils.getAppState(jar);
@@ -562,7 +565,7 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
   // At the end we call the callback or catch an exception
   mainPromise
     .then(function () {
-      log.info("login", 'Done logging in.');
+      console.log(`${chalk.bold.magentaBright(`[ NAUGHTY-FB-CHATIFY ] >> `)} ${chalk.redBright(`Done Logging In....`)}`);
       return callback(null, api);
     })
     .catch(function (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naughty-fb-chatify",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Fca For Naughty-Bot-V1",
   "scripts": {
     "test": "mocha",