@dongdev/fca-unofficial 0.0.2 → 0.0.4

package/index.js

@@ -10,73 +10,76 @@ var defaultLogRecordSize = 100;
 log.maxRecordSize = defaultLogRecordSize;
 
 function setOptions(globalOptions, options) {
-  Object.keys(options).map(function (key) {
-    switch (key) {
-      case 'pauseLog':
-        if (options.pauseLog) log.pause();
-        break;
-      case 'online':
-        globalOptions.online = Boolean(options.online);
-        break;
-      case 'logLevel':
-        log.level = options.logLevel;
-        globalOptions.logLevel = options.logLevel;
-        break;
-      case 'logRecordSize':
-        log.maxRecordSize = options.logRecordSize;
-        globalOptions.logRecordSize = options.logRecordSize;
-        break;
-      case 'selfListen':
-        globalOptions.selfListen = Boolean(options.selfListen);
-        break;
-      case 'listenEvents':
-        globalOptions.listenEvents = Boolean(options.listenEvents);
-        break;
-      case 'pageID':
-        globalOptions.pageID = options.pageID.toString();
-        break;
-      case 'updatePresence':
-        globalOptions.updatePresence = Boolean(options.updatePresence);
-        break;
-      case 'forceLogin':
-        globalOptions.forceLogin = Boolean(options.forceLogin);
-        break;
-      case 'userAgent':
-        globalOptions.userAgent = options.userAgent;
-        break;
-      case 'autoMarkDelivery':
-        globalOptions.autoMarkDelivery = Boolean(options.autoMarkDelivery);
-        break;
-      case 'autoMarkRead':
-        globalOptions.autoMarkRead = Boolean(options.autoMarkRead);
-        break;
-      case 'listenTyping':
-        globalOptions.listenTyping = Boolean(options.listenTyping);
-        break;
-      case 'proxy':
-        if (typeof options.proxy != "string") {
-          delete globalOptions.proxy;
-          utils.setProxy();
-        }
-        else {
-          globalOptions.proxy = options.proxy;
-          utils.setProxy(globalOptions.proxy);
-        }
-        break;
-      case 'autoReconnect':
-        globalOptions.autoReconnect = Boolean(options.autoReconnect);
-        break;
-      case 'emitReady':
-        globalOptions.emitReady = Boolean(options.emitReady);
-        break;
-      default:
-        log.warn("setOptions", "Unrecognized option given to setOptions: " + key);
-        break;
-    }
-  });
+  if (options && typeof options === 'object') {
+    Object.keys(options).map(function (key) {
+      switch (key) {
+        case 'pauseLog':
+          if (options.pauseLog) log.pause();
+          break;
+        case 'online':
+          globalOptions.online = Boolean(options.online);
+          break;
+        case 'logLevel':
+          log.level = options.logLevel;
+          globalOptions.logLevel = options.logLevel;
+          break;
+        case 'logRecordSize':
+          log.maxRecordSize = options.logRecordSize;
+          globalOptions.logRecordSize = options.logRecordSize;
+          break;
+        case 'selfListen':
+          globalOptions.selfListen = Boolean(options.selfListen);
+          break;
+        case 'listenEvents':
+          globalOptions.listenEvents = Boolean(options.listenEvents);
+          break;
+        case 'pageID':
+          globalOptions.pageID = options.pageID.toString();
+          break;
+        case 'updatePresence':
+          globalOptions.updatePresence = Boolean(options.updatePresence);
+          break;
+        case 'forceLogin':
+          globalOptions.forceLogin = Boolean(options.forceLogin);
+          break;
+        case 'userAgent':
+          globalOptions.userAgent = options.userAgent;
+          break;
+        case 'autoMarkDelivery':
+          globalOptions.autoMarkDelivery = Boolean(options.autoMarkDelivery);
+          break;
+        case 'autoMarkRead':
+          globalOptions.autoMarkRead = Boolean(options.autoMarkRead);
+          break;
+        case 'listenTyping':
+          globalOptions.listenTyping = Boolean(options.listenTyping);
+          break;
+        case 'proxy':
+          if (typeof options.proxy != "string") {
+            delete globalOptions.proxy;
+            utils.setProxy();
+          } else {
+            globalOptions.proxy = options.proxy;
+            utils.setProxy(globalOptions.proxy);
+          }
+          break;
+        case 'autoReconnect':
+          globalOptions.autoReconnect = Boolean(options.autoReconnect);
+          break;
+        case 'emitReady':
+          globalOptions.emitReady = Boolean(options.emitReady);
+          break;
+        default:
+          log.warn("setOptions", "Unrecognized option given to setOptions: " + key);
+          break;
+      }
+    });
+  } else {
+    log.warn("setOptions", "Invalid or undefined options provided.");
+  }
 }
 
-function buildAPI(globalOptions, html, jar) {
+function buildAPI(globalOptions, html, jar, bypass_region_err) {
   var maybeCookie = jar.getCookies("https://www.facebook.com").filter(function (val) {
     return val.cookieString().split("=")[0] === "c_user";
   });
@@ -126,6 +129,7 @@ function buildAPI(globalOptions, html, jar) {
       }
       else {
         log.warn("login", "Cannot get MQTT region & sequence ID.");
+        log.info('login', 'Bypass vùng tài khoản thành công');
         noMqttData = html;
       }
     }
@@ -156,6 +160,7 @@ function buildAPI(globalOptions, html, jar) {
   };
 
   if (noMqttData) api["htmlData"] = noMqttData;
+  if (bypass_region_err) log.info('login', 'Bypass vùng tài khoản thành công');
 
   const apiFuncNames = [
     'addExternalModule',
@@ -453,36 +458,50 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
   var redirect = [1, "https://m.facebook.com/"], bypass_region_err = false, ctx, _defaultFuncs, api;
   function CheckAndFixErr(res) {
-      if (/This browser is not supported/gs.test(res.body)) {
-          let fid = (res.body.split('2Fhome.php&gfid=')[1] || '').split("\\")[0];
-          if (!fid) return res;
-          bypass_region_err = true;
-          let redirectlink = `${redirect[1]}a/preferences.php?basic_site_devices=m_basic&uri=${encodeURIComponent("https://m.facebook.com/home.php")}&gfid=${fid}`;
-          return utils.get(redirectlink, jar, null, globalOptions).then(utils.saveCookies(jar));
-      }
-      return res;
-  }
-  function Redirect(res) {
-      let match = /<meta http-equiv="refresh" content="0;url=([^"]+)[^>]+>/.exec(res.body);
-      return match ? utils.get(match[1], jar, null, globalOptions).then(utils.saveCookies(jar)) : res;
-  }
-  mainPromise = mainPromise
-      .then(Redirect)
-      .then(CheckAndFixErr)
-      .then(res => {
-          if (!/MPageLoadClientMetrics/gs.test(res.body)) {
-              globalOptions.userAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X)";
-              return utils.get('https://www.facebook.com/', jar, null, globalOptions, { noRef: true }).then(utils.saveCookies(jar));
-          }
-          return res;
-      })
-      .then(Redirect)
-      .then(CheckAndFixErr)
-      .then(res => {
-          let stuff = buildAPI(globalOptions, res.body, jar, bypass_region_err);
-          [ctx, _defaultFuncs, api] = stuff;
-          return res;
-      });  
+        let reg_antierr = /This browser is not supported/gs;
+        if (reg_antierr.test(res.body)) {
+            const Data = JSON.stringify(res.body);
+            const Dt_Check = Data.split('2Fhome.php&amp;gfid=')[1];
+            if (Dt_Check == undefined) return res
+            const fid = Dt_Check.split("\\\\")[0];
+            if (Dt_Check == undefined || Dt_Check == "") return res
+            const final_fid = fid.split(`\\`)[0];
+            if (final_fid == undefined || final_fid == '') return res;
+            const redirectlink = redirect[1] + "a/preferences.php?basic_site_devices=m_basic&uri=" + encodeURIComponent("https://m.facebook.com/home.php") + "&gfid=" + final_fid;
+            bypass_region_err = true;
+            log.info('login', 'Bypass vùng tài khoản thành công');
+            return utils.get(redirectlink, jar, null, globalOptions).then(utils.saveCookies(jar));
+        }
+        else return res
+    }
+    function Redirect(res) {
+        var reg = /<meta http-equiv="refresh" content="0;url=([^"]+)[^>]+>/;
+        redirect = reg.exec(res.body);
+            if (redirect && redirect[1]) return utils.get(redirect[1], jar, null, globalOptions).then(utils.saveCookies(jar));
+        return res;
+    }
+
+ mainPromise = mainPromise
+        .then(res => Redirect(res))
+        .then(res => CheckAndFixErr(res))
+        .then(function(res) {
+                    let Regex_Via = /MPageLoadClientMetrics/gs;
+                    if (!Regex_Via.test(res.body)) {
+                        globalOptions.userAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1";
+                        return utils.get('https://www.facebook.com/', jar, null, globalOptions, { noRef: true }).then(utils.saveCookies(jar));
+                    }
+                    else return res
+                })
+        .then(res => Redirect(res))
+        .then(res => CheckAndFixErr(res))
+        .then(function (res) {
+              var html = res.body;
+              var stuff = buildAPI(globalOptions, html, jar, bypass_region_err);
+              ctx = stuff[0];
+              _defaultFuncs = stuff[1];
+              api = stuff[2];
+              return res;
+        });
 
   // given a pageID we log in as a page
   if (globalOptions.pageID) {

package/package.json

@@ -1,24 +1,11 @@
 {
   "name": "@dongdev/fca-unofficial",
-  "version": "0.0.2",
-  "description": "A Facebook chat API that doesn't rely on XMPP. Will NOT be deprecated after April 30th 2015.",
-  "scripts": {
-    "test": "mocha",
-    "lint": "eslint **.js",
-    "prettier": "prettier utils.js src/* --write"
-  },
+  "version": "0.0.4",
+  "description": "A Facebook chat API without XMPP, will not be deprecated after April 30th, 2015.",
+  "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "git://github.com/DongDevVN/fca-unofficial.git"
-  },
-  "keywords": [
-    "facebook",
-    "chat",
-    "api",
-    "fca"
-  ],
-  "bugs": {
-    "url": "https://github.com/DongDevVN/fca-unofficial/issues"
+    "url": "https://github.com/DongDev-VN/fca-unofficial.git"
   },
   "author": "Avery, David, Maude, Benjamin, UIRI, MiraiTeam",
   "license": "MIT",
@@ -31,51 +18,31 @@
     "request": "^2.53.0",
     "websocket-stream": "^5.5.0"
   },
-  "engines": {
-    "node": ">=10.x"
-  },
   "devDependencies": {
     "eslint": "^7.5.0",
     "mocha": "^7.0.1",
     "prettier": "^1.11.1"
   },
-  "eslintConfig": {
-    "env": {
-      "es6": true,
-      "es2017": true,
-      "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-      "sourceType": "module"
-    },
-    "rules": {
-      "linebreak-style": [
-        "error",
-        "unix"
-      ],
-      "semi": [
-        "error",
-        "always"
-      ],
-      "no-unused-vars": [
-        1,
-        {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_"
-        }
-      ],
-      "no-empty": [
-        "error",
-        {
-          "allowEmptyCatch": true
-        }
-      ]
-    }
+  "scripts": {
+    "test": "mocha",
+    "lint": "eslint **/*.js",
+    "prettier": "prettier utils.js src/* --write"
+  },
+  "keywords": [
+    "facebook",
+    "chat",
+    "api",
+    "fca",
+    "facebook-chat-api"
+  ],
+  "engines": {
+    "node": ">=10.x"
+  },
+  "homepage": "https://github.com/DongDev-VN/fca-unofficial#readme",
+  "bugs": {
+    "url": "https://github.com/DongDev-VN/fca-unofficial/issues"
   },
-  "homepage": "https://github.com/DongDevVN/fca-unofficial#readme",
-  "main": "index.js",
   "directories": {
     "test": "test"
   }
-}
+}