alicezetion 1.8.8 → 1.9.0

package/index.js

@@ -1,20 +1,16 @@
 "use strict";
 
 const utils = require("./utils");
-const cheerio = require("cheerio");
 const log = require("npmlog");
 
-let checkVerified = null;
+const checkVerified = null;
 
 const defaultLogRecordSize = 100;
 log.maxRecordSize = defaultLogRecordSize;
 
 function setOptions(globalOptions, options) {
-  Object.keys(options).map(function(key) {
+  Object.keys(options).map(function (key) {
     switch (key) {
-      case 'pauseLog':
-        if (options.pauseLog) log.pause();
-        break;
       case 'online':
         globalOptions.online = Boolean(options.online);
         break;
@@ -29,6 +25,9 @@ function setOptions(globalOptions, options) {
       case 'selfListen':
         globalOptions.selfListen = Boolean(options.selfListen);
         break;
+      case 'selfListenEvent':
+        globalOptions.selfListenEvent = options.selfListenEvent;
+        break;
       case 'listenEvents':
         globalOptions.listenEvents = Boolean(options.listenEvents);
         break;
@@ -76,23 +75,27 @@ function setOptions(globalOptions, options) {
 }
 
 function buildAPI(globalOptions, html, jar) {
-  const maybeCookie = jar.getCookies("https://www.facebook.com").filter(function(val) {
+  const maybeCookie = jar.getCookies("https://www.facebook.com").filter(function (val) {
     return val.cookieString().split("=")[0] === "c_user";
   });
 
-  const objCookie = jar.getCookies("https://www.facebook.com").reduce(function(obj, val) {
+  const objCookie = jar.getCookies("https://www.facebook.com").reduce(function (obj, val) {
     obj[val.cookieString().split("=")[0]] = val.cookieString().split("=")[1];
     return obj;
   }, {});
 
   if (maybeCookie.length === 0) {
-    throw { error: "please check your facebook account and get new alicestate" };
+    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." };
   }
+
   if (html.indexOf("/checkpoint/block/?next") > -1) {
-    throw { error: "your facebook account has been ended please check it and get new alicestate"}
+    log.warn("login", "Checkpoint detected. Please log in with a browser to verify.");
   }
+
   const userID = maybeCookie[0].cookieString().split("=")[1].toString();
   const i_userID = objCookie.i_user || null;
+  log.info("login", `Logged in as ${userID}`);
+
   try {
     clearInterval(checkVerified);
   } catch (_) { }
@@ -110,18 +113,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}`);
   } else {
     const 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}`);
     } else {
       const 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]}`);
       } else {
+        log.warn("login", "Cannot get MQTT region & sequence ID.");
         noMqttData = html;
       }
     }
@@ -140,6 +149,8 @@ function buildAPI(globalOptions, html, jar) {
     mqttClient: undefined,
     lastSeqId: irisSeqID,
     syncToken: undefined,
+    wsReqNumber: 0,
+    wsTaskNumber: 0,
     mqttEndpoint,
     region,
     firstListen: true
@@ -150,7 +161,7 @@ function buildAPI(globalOptions, html, jar) {
     getAppState: function getAppState() {
       const appState = utils.getAppState(jar);
       // filter duplicate
-      return appState.filter((item, index, self) => self.findIndex((t) => { return t.key === item.key }) === index);
+      return appState.filter((item, index, self) => self.findIndex((t) => { return t.key === item.key; }) === index);
     }
   };
 
@@ -159,6 +170,9 @@ function buildAPI(globalOptions, html, jar) {
   }
 
   const apiFuncNames = [
+    'seen',
+    'chat',
+    'react',
     'addExternalModule',
     'addUserToGroup',
     'changeAdminStatus',
@@ -170,12 +184,10 @@ function buildAPI(globalOptions, html, jar) {
     'changeNickname',
     'changeThreadColor',
     'changeThreadEmoji',
-    'chat',
     'createNewGroup',
     'createPoll',
     'deleteMessage',
     'deleteThread',
-    'edit',
     'forwardAttachment',
     'getCurrentUserID',
     'getEmojiUrl',
@@ -195,21 +207,19 @@ function buildAPI(globalOptions, html, jar) {
     'markAsReadAll',
     'markAsSeen',
     'muteThread',
-    'react',
     'refreshFb_dtsg',
     'removeUserFromGroup',
     'resolvePhotoUrl',
     'searchForThread',
-    'seen',
     'sendMessage',
     'sendTypingIndicator',
     'setMessageReaction',
     'setPostReaction',
     'setTitle',
     'threadColors',
-    'token',
     'unsendMessage',
     'unfriend',
+    'editMessage',
 
     // HTTP
     'httpGet',
@@ -222,8 +232,8 @@ function buildAPI(globalOptions, html, jar) {
   const defaultFuncs = utils.makeDefaults(html, i_userID || userID, ctx);
 
   // Load all api functions in a loop
-  apiFuncNames.map(function(v) {
-    api[v] = require('./leiamnash/' + v)(defaultFuncs, api, ctx);
+  apiFuncNames.map(function (v) {
+    api[v] = require('./src/' + v)(defaultFuncs, api, ctx);
   });
 
   //Removing original `listen` that uses pull.
@@ -233,255 +243,6 @@ function buildAPI(globalOptions, html, jar) {
   return [ctx, defaultFuncs, api];
 }
 
-function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
-  return function(res) {
-    const html = res.body;
-    const $ = cheerio.load(html);
-    let arr = [];
-
-    // This will be empty, but just to be sure we leave it
-    $("#login_form input").map(function(i, v) {
-      arr.push({ val: $(v).val(), name: $(v).attr("name") });
-    });
-
-    arr = arr.filter(function(v) {
-      return v.val && v.val.length;
-    });
-
-    const form = utils.arrToForm(arr);
-    form.lsd = utils.getFrom(html, "[\"LSD\",[],{\"token\":\"", "\"}");
-    form.lgndim = Buffer.from("{\"w\":1440,\"h\":900,\"aw\":1440,\"ah\":834,\"c\":24}").toString('base64');
-    form.email = email;
-    form.pass = password;
-    form.default_persistent = '0';
-    form.lgnrnd = utils.getFrom(html, "name=\"lgnrnd\" value=\"", "\"");
-    form.locale = 'en_US';
-    form.timezone = '240';
-    form.lgnjs = ~~(Date.now() / 1000);
-
-
-    // Getting cookies from the HTML page... (kill me now plz)
-    // we used to get a bunch of cookies in the headers of the response of the
-    // request, but FB changed and they now send those cookies inside the JS.
-    // They run the JS which then injects the cookies in the page.
-    // The "solution" is to parse through the html and find those cookies
-    // which happen to be conveniently indicated with a _js_ in front of their
-    // variable name.
-    //
-    // ---------- Very Hacky Part Starts -----------------
-    const willBeCookies = html.split("\"_js_");
-    willBeCookies.slice(1).map(function(val) {
-      const cookieData = JSON.parse("[\"" + utils.getFrom(val, "", "]") + "]");
-      jar.setCookie(utils.formatCookie(cookieData, "facebook"), "https://www.facebook.com");
-    });
-    // ---------- Very Hacky Part Ends -----------------
- 
-    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) {
-        const headers = res.headers;
-        if (!headers.location) {
-          throw { error: "Wrong username/password." };
-        }
-
-        // 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.");
-          const nextURL = 'https://www.facebook.com/checkpoint/?next=https%3A%2F%2Fwww.facebook.com%2Fhome.php';
-
-          return utils
-            .get(headers.location, jar, null, loginOptions)
-            .then(utils.saveCookies(jar))
-            .then(function(res) {
-              const html = res.body;
-              // Make the form in advance which will contain the fb_dtsg and nh
-              const $ = cheerio.load(html);
-              let arr = [];
-              $("form input").map(function(i, v) {
-                arr.push({ val: $(v).val(), name: $(v).attr("name") });
-              });
-
-              arr = arr.filter(function(v) {
-                return v.val && v.val.length;
-              });
-
-              const form = utils.arrToForm(arr);
-              if (html.indexOf("checkpoint/?next") > -1) {
-                setTimeout(() => {
-                  checkVerified = setInterval((_form) => {
-                    /* utils
-                      .post("https://www.facebook.com/login/approvals/approved_machine_check/", jar, form, loginOptions, null, {
-                        "Referer": "https://www.facebook.com/checkpoint/?next"
-                      })
-                      .then(utils.saveCookies(jar))
-                      .then(res => {
-                        try {
-                          JSON.parse(res.body.replace(/for\s*\(\s*;\s*;\s*\)\s*;\s*()/, ""));
-                        } catch (ex) {
-                          clearInterval(checkVerified);
-                          log.info("login", "Verified from browser. Logging in...");
-                          return loginHelper(utils.getAppState(jar), email, password, loginOptions, callback);
-                        }
-                      })
-                      .catch(ex => {
-                        log.error("login", ex);
-                      }); */
-                  }, 5000, {
-                    fb_dtsg: form.fb_dtsg,
-                    jazoest: form.jazoest,
-                    dpr: 1
-                  });
-                }, 2500);
-                throw {
-                  error: 'login-approval',
-                  continue: function submit2FA(code) {
-                    form.approvals_code = code;
-                    form['submit[Continue]'] = $("#checkpointSubmitButton").html(); //'Continue';
-                    let prResolve = null;
-                    let prReject = null;
-                    const rtPromise = new Promise(function(resolve, reject) {
-                      prResolve = resolve;
-                      prReject = reject;
-                    });
-                    if (typeof code == "string") {
-                      utils
-                        .post(nextURL, jar, form, loginOptions)
-                        .then(utils.saveCookies(jar))
-                        .then(function(res) {
-                          const $ = cheerio.load(res.body);
-                          const error = $("#approvals_code").parent().attr("data-xui-error");
-                          if (error) {
-                            throw {
-                              error: 'login-approval',
-                              errordesc: "Invalid 2FA code.",
-                              lerror: error,
-                              continue: submit2FA
-                            };
-                          }
-                        })
-                        .then(function() {
-                          // Use the same form (safe I hope)
-                          delete form.no_fido;
-                          delete form.approvals_code;
-                          form.name_action_selected = 'dont_save'; //'save_device';
-
-                          return utils
-                            .post(nextURL, jar, form, loginOptions)
-                            .then(utils.saveCookies(jar));
-                        })
-                        .then(function(res) {
-                          const headers = res.headers;
-                          if (!headers.location && res.body.indexOf('Review Recent Login') > -1) {
-                            throw { error: "Something went wrong with login approvals." };
-                          }
-
-                          const appState = utils.getAppState(jar);
-
-                          if (callback === prCallback) {
-                            callback = function(err, api) {
-                              if (err) {
-                                return prReject(err);
-                              }
-                              return prResolve(api);
-                            };
-                          }
-
-                          // Simply call loginHelper because all it needs is the jar
-                          // and will then complete the login process
-                          return loginHelper(appState, email, password, loginOptions, callback);
-                        })
-                        .catch(function(err) {
-                          // Check if using Promise instead of callback
-                          if (callback === prCallback) {
-                            prReject(err);
-                          } else {
-                            callback(err);
-                          }
-                        });
-                    } else {
-                      utils
-                        .post("https://www.facebook.com/checkpoint/?next=https%3A%2F%2Fwww.facebook.com%2Fhome.php", jar, form, loginOptions, null, {
-                          "Referer": "https://www.facebook.com/checkpoint/?next"
-                        })
-                        .then(utils.saveCookies(jar))
-                        .then(res => {
-                          try {
-                            JSON.parse(res.body.replace(/for\s*\(\s*;\s*;\s*\)\s*;\s*/, ""));
-                          } catch (ex) {
-                            clearInterval(checkVerified);
-                          
-                            if (callback === prCallback) {
-                              callback = function(err, api) {
-                                if (err) {
-                                  return prReject(err);
-                                }
-                                return prResolve(api);
-                              };
-                            }
-                            return loginHelper(utils.getAppState(jar), email, password, loginOptions, callback);
-                          }
-                        })
-                        .catch(ex => {
-                          log.error("login", ex);
-                          if (callback === prCallback) {
-                            prReject(ex);
-                          } else {
-                            callback(ex);
-                          }
-                        });
-                    }
-                    return rtPromise;
-                  }
-                };
-              } 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." };
-                }
-                if (html.indexOf("Suspicious Login Attempt") > -1) {
-                  form['submit[This was me]'] = "This was me";
-                } else {
-                  form['submit[This Is Okay]'] = "This Is Okay";
-                }
-
-                return utils
-                  .post(nextURL, jar, form, loginOptions)
-                  .then(utils.saveCookies(jar))
-                  .then(function() {
-                    // Use the same form (safe I hope)
-                    form.name_action_selected = 'save_device';
-
-                    return utils
-                      .post(nextURL, jar, form, loginOptions)
-                      .then(utils.saveCookies(jar));
-                  })
-                  .then(function(res) {
-                    const headers = res.headers;
-
-                    if (!headers.location && res.body.indexOf('Review Recent Login') > -1) {
-                      throw { error: "Something went wrong with review recent login." };
-                    }
-
-                    const appState = utils.getAppState(jar);
-
-                    // Simply call loginHelper because all it needs is the jar
-                    // and will then complete the login process
-                    return loginHelper(appState, email, password, loginOptions, callback);
-                  })
-                  .catch(function(e) {
-                    callback(e);
-                  });
-              }
-            });
-        }
-
-        return utils
-          .get('https://www.facebook.com/', jar, null, loginOptions)
-          .then(utils.saveCookies(jar));
-      });
-  };
-}
-
 // Helps the login
 function loginHelper(appState, email, password, globalOptions, callback, prCallback) {
   let mainPromise = null;
@@ -490,7 +251,31 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
   // If we're given an appState we loop through it and save each cookie
   // back into the jar.
   if (appState) {
-    appState.map(function(c) {
+    // check and convert cookie to appState
+    if (utils.getType(appState) === 'Array' && appState.some(c => c.name)) {
+      appState = appState.map(c => {
+        c.key = c.name;
+        delete c.name;
+        return c;
+      });
+    }
+    else if (utils.getType(appState) === 'String') {
+      const arrayAppState = [];
+      appState.split(';').forEach(c => {
+        const [key, value] = c.split('=');
+
+        arrayAppState.push({
+          key: (key || "").trim(),
+          value: (value || "").trim(),
+          domain: "facebook.com",
+          path: "/",
+          expires: new Date().getTime() + 1000 * 60 * 60 * 24 * 365
+        });
+      });
+      appState = arrayAppState;
+    }
+
+    appState.map(function (c) {
       const str = c.key + "=" + c.value + "; expires=" + c.expires + "; domain=" + c.domain + "; path=" + c.path + ";";
       jar.setCookie(str, "http://" + c.domain);
     });
@@ -500,17 +285,12 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
       .get('https://www.facebook.com/', jar, null, globalOptions, { noRef: true })
       .then(utils.saveCookies(jar));
   } else {
-    // Open the main page, then we login with the given credentials and finally
-    // load the main page again (it'll give us some IDs that we need)
-    mainPromise = utils
-      .get("https://www.facebook.com/", null, null, globalOptions, { noRef: true })
-      .then(utils.saveCookies(jar))
-      .then(makeLogin(jar, email, password, globalOptions, callback, prCallback))
-      .then(function() {
-        return utils
-          .get('https://www.facebook.com/', jar, null, globalOptions)
-          .then(utils.saveCookies(jar));
-      });
+    if (email) {
+      throw { error: "Currently, the login method by email and password is no longer supported, please use the login method by appState" };
+    }
+    else {
+      throw { error: "No appState given." };
+    }
   }
 
   let ctx = null;
@@ -518,7 +298,7 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
   let api = null;
 
   mainPromise = mainPromise
-    .then(function(res) {
+    .then(function (res) {
       // Hacky check for the redirection that happens on some ISPs, which doesn't return statusCode 3xx
       const reg = /<meta http-equiv="refresh" content="0;url=([^"]+)[^>]+>/;
       const redirect = reg.exec(res.body);
@@ -529,7 +309,7 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
       }
       return res;
     })
-    .then(function(res) {
+    .then(function (res) {
       const html = res.body;
       const stuff = buildAPI(globalOptions, html, jar);
       ctx = stuff[0];
@@ -541,11 +321,11 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
   // given a pageID we log in as a page
   if (globalOptions.pageID) {
     mainPromise = mainPromise
-      .then(function() {
+      .then(function () {
         return utils
           .get('https://www.facebook.com/' + ctx.globalOptions.pageID + '/messages/?section=messages&subsection=inbox', ctx.jar, null, globalOptions);
       })
-      .then(function(resData) {
+      .then(function (resData) {
         let url = utils.getFrom(resData.body, 'window.location.replace("https:\\/\\/www.facebook.com\\', '");').split('\\').join('');
         url = url.substring(0, url.length - 1);
 
@@ -556,10 +336,11 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
   // At the end we call the callback or catch an exception
   mainPromise
-    .then(function() {
+    .then(function () {
+      log.info("login", 'Done logging in.');
       return callback(null, api);
     })
-    .catch(function(e) {
+    .catch(function (e) {
       log.error("login", e.error || e);
       callback(e);
     });
@@ -593,11 +374,11 @@ function alice(loginData, options, callback) {
   if (utils.getType(callback) !== "Function" && utils.getType(callback) !== "AsyncFunction") {
     let rejectFunc = null;
     let resolveFunc = null;
-    var returnPromise = new Promise(function(resolve, reject) {
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
-    prCallback = function(error, api) {
+    prCallback = function (error, api) {
       if (error) {
         return rejectFunc(error);
       }
@@ -609,4 +390,4 @@ function alice(loginData, options, callback) {
   return returnPromise;
 }
 
-module.exports = alice;
+module.exports = alice;

package/leiamnash/listenMqtt.js

@@ -244,9 +244,7 @@ function listenMqtt(defaultFuncs, api, ctx, globalCallback) {
     }
 
   });
-mqttClient.on('close', function () {
-    globalCallback("Connection closed.");    
-  });
+
 }
 
 function parseDelta(defaultFuncs, api, ctx, globalCallback, v) {
@@ -554,6 +552,7 @@ function parseDelta(defaultFuncs, api, ctx, globalCallback, v) {
         case "change_thread_theme":
         case "change_thread_nickname":
         case "change_thread_icon":
+        case "change_thread_quick_reaction":
         case "change_thread_admins":
         case "group_poll":
         case "joinable_group_link_mode_change":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alicezetion",
-  "version": "1.8.8",
+  "version": "1.9.0",
   "description": "",
   "scripts": {
     "start": "node index.js"
@@ -19,7 +19,6 @@
   "author": "LeiamNash",
   "license": "MIT",
   "dependencies": {
-    "bluebird": "^2.11.0",
     "cheerio": "^1.0.0-rc.12",
     "https-proxy-agent": "^5.0.1",
     "mqtt": "^4.3.7",