node-ainzfb-new 1.6.2431-test → 1.6.2511-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-ainzfb-new",
-  "version": "1.6.2431-test",
+  "version": "1.6.2511-test",
   "description": "A Facebook chat API that doesn't rely on XMPP. Will NOT be deprecated after April 30th 2015.",
   "scripts": {
     "test": "mocha",
@@ -35,7 +35,8 @@
     "https-proxy-agent": "latest",
     "is-hexcolor": "^1.0.0",
     "lodash": "",
-    "mqtt": "^4.3.7",
+    "mqtt": "^3.0.0",
+    "node-superfetch": "^0.2.3",
     "npmlog": "^1.2.0",
     "path": "latest",
     "pretty-ms": "latest",

package/utils.js

@@ -1019,75 +1019,119 @@ function makeDefaults(html, userID, ctx) {
 }
 
 function parseAndCheckLogin(ctx, defaultFuncs, retryCount) {
-    if (retryCount == undefined) retryCount = 0;
-    return function(data) {
-        return bluebird.try(function() {
-            log.verbose("parseAndCheckLogin", data.body);
-            if (data.statusCode >= 500 && data.statusCode < 600) {
-                if (retryCount >= 5) {
-                    throw {
-                        error: "Request retry failed. Check the `res` and `statusCode` property on this error.",
-                        statusCode: data.statusCode,
-                        res: data.body
-                    };
-                }
-                retryCount++;
-                var retryTime = Math.floor(Math.random() * 5000);
-                log.warn("parseAndCheckLogin", "Got status code " + data.statusCode + " - " + retryCount + ". attempt to retry in " + retryTime + " milliseconds...");
-                var url = data.request.uri.protocol + "//" + data.request.uri.hostname + data.request.uri.pathname;
-                if (data.request.headers["Content-Type"].split(";")[0] === "multipart/form-data") {
-                    return bluebird.delay(retryTime).then(() => defaultFuncs.postFormData(url, ctx.jar, data.request.formData, {}))
-                        .then(parseAndCheckLogin(ctx, defaultFuncs, retryCount));
-                } else {
-                    return bluebird.delay(retryTime).then(() => defaultFuncs.post(url, ctx.jar, data.request.formData))
-                        .then(parseAndCheckLogin(ctx, defaultFuncs, retryCount));
-                }
-            }
-            if (data.statusCode !== 200) throw new Error("parseAndCheckLogin got status code: " + data.statusCode + ". Bailing out of trying to parse response.");
-
-            var res = null;
-            try {
-                res = JSON.parse(makeParsable(data.body));
-            } catch (e) {
-                throw {
-                    error: "JSON.parse error. Check the `detail` property on this error.",
-                    detail: e,
-                    res: data.body
-                };
-            }
-
-            // In some cases the response contains only a redirect URL which should be followed
-            if (res.redirect && data.request.method === "GET") return defaultFuncs.get(res.redirect, ctx.jar).then(parseAndCheckLogin(ctx, defaultFuncs));
-
-            // TODO: handle multiple cookies?
-            if (res.jsmods && res.jsmods.require && Array.isArray(res.jsmods.require[0]) && res.jsmods.require[0][0] === "Cookie") {
-                res.jsmods.require[0][3][0] = res.jsmods.require[0][3][0].replace("_js_", "");
-                var cookie = formatCookie(res.jsmods.require[0][3], "facebook");
-                var cookie2 = formatCookie(res.jsmods.require[0][3], "messenger");
-                ctx.jar.setCookie(cookie, "https://www.facebook.com");
-                ctx.jar.setCookie(cookie2, "https://www.messenger.com");
-            }
-
-            // On every request we check if we got a DTSG and we mutate the context so that we use the latest
-            // one for the next requests.
-            if (res.jsmods && Array.isArray(res.jsmods.require)) {
-                var arr = res.jsmods.require;
-                for (var i in arr) {
-                    if (arr[i][0] === "DTSG" && arr[i][1] === "setToken") {
-                        ctx.fb_dtsg = arr[i][3][0];
-
-                        // Update ttstamp since that depends on fb_dtsg
-                        ctx.ttstamp = "2";
-                        for (var j = 0; j < ctx.fb_dtsg.length; j++) ctx.ttstamp += ctx.fb_dtsg.charCodeAt(j);
-                    }
-                }
+    if (retryCount == undefined) {
+      retryCount = 0;
+    }
+    return function (data) {
+      return bluebird.try(function () {
+
+        if (data.statusCode >= 500 && data.statusCode < 600) {
+          if (retryCount >= 5) {
+            throw {
+              error:
+                "Request retry failed. Check the `res` and `statusCode` property on this error.",
+              statusCode: data.statusCode,
+              res: data.body
+            };
+          }
+          retryCount++;
+          var retryTime = Math.floor(Math.random() * 5000);
+          var url =
+            data.request.uri.protocol +
+            "//" +
+            data.request.uri.hostname +
+            data.request.uri.pathname;
+          if (
+            data.request.headers["Content-Type"].split(";")[0] ===
+            "multipart/form-data"
+          ) {
+            return bluebird
+              .delay(retryTime)
+              .then(function () {
+                return defaultFuncs.postFormData(
+                  url,
+                  ctx.jar,
+                  data.request.formData,
+                  {}
+                );
+              })
+              .then(parseAndCheckLogin(ctx, defaultFuncs, retryCount));
+          } else {
+            return bluebird
+              .delay(retryTime)
+              .then(function () {
+                return defaultFuncs.post(url, ctx.jar, data.request.formData);
+              })
+              .then(parseAndCheckLogin(ctx, defaultFuncs, retryCount));
+          }
+        }
+        if (data.statusCode !== 200)
+          throw new Error(
+            "parseAndCheckLogin got status code: " +
+            data.statusCode +
+            ". Bailing out of trying to parse response."
+          );
+  
+        var res = null;
+        try {
+          res = JSON.parse(makeParsable(data.body));
+        } catch (e) {
+          throw {
+            error: "JSON.parse error. Check the `detail` property on this error.",
+            detail: e,
+            res: data.body
+          };
+        }
+  
+        // In some cases the response contains only a redirect URL which should be followed
+        if (res.redirect && data.request.method === "GET") {
+          return defaultFuncs
+            .get(res.redirect, ctx.jar)
+            .then(parseAndCheckLogin(ctx, defaultFuncs));
+        }
+  
+        // TODO: handle multiple cookies?
+        if (
+          res.jsmods &&
+          res.jsmods.require &&
+          Array.isArray(res.jsmods.require[0]) &&
+          res.jsmods.require[0][0] === "Cookie"
+        ) {
+          res.jsmods.require[0][3][0] = res.jsmods.require[0][3][0].replace(
+            "_js_",
+            ""
+          );
+          var cookie = formatCookie(res.jsmods.require[0][3], "facebook");
+          var cookie2 = formatCookie(res.jsmods.require[0][3], "messenger");
+          ctx.jar.setCookie(cookie, "https://www.facebook.com");
+          ctx.jar.setCookie(cookie2, "https://www.messenger.com");
+        }
+  
+        // On every request we check if we got a DTSG and we mutate the context so that we use the latest
+        // one for the next requests.
+        if (res.jsmods && Array.isArray(res.jsmods.require)) {
+          var arr = res.jsmods.require;
+          for (var i in arr) {
+            if (arr[i][0] === "DTSG" && arr[i][1] === "setToken") {
+              ctx.fb_dtsg = arr[i][3][0];
+  
+              // Update ttstamp since that depends on fb_dtsg
+              ctx.ttstamp = "2";
+              for (var j = 0; j < ctx.fb_dtsg.length; j++) {
+                ctx.ttstamp += ctx.fb_dtsg.charCodeAt(j);
+              }
             }
-
-            if (res.error === 1357001) throw { error: "Chưa Đăng Nhập Được - Appstate Đã Bị Lỗi" };
-            return res;
-        });
+          }
+        }
+  
+        if (res.error === 1357001) {
+          throw { error: "Not logged in." };
+        }
+        return res;
+      });
     };
-}
+  }
+  
 
 function saveCookies(jar) {
     return function(res) {