alicezetion 1.5.4 → 1.5.6

package/.cache/replit/__replit_disk_meta.json

@@ -1 +1 @@
-{"nonce":8394449526511183401,"last_updated":{"seconds":1693574365,"nanos":509516000}}
+{"nonce":5642102250332360091,"last_updated":{"seconds":1693575920,"nanos":837442000}}

package/index.js

@@ -66,83 +66,66 @@ function setOptions(globalOptions, options) {
         globalOptions.emitReady = Boolean(options.emitReady);
         break;
       default:
-        log.warn("setOptions", "Unrecognized option given to setOptions: " + key);
+        log.warn("setOptions", "Unrecognized option given to setOptions: " + key);        
         break;
     }
   });
 }
-
-function buildAPI(globalOptions, html, jar) {
-  var maybeCookie = jar.getCookies("https://www.facebook.com").filter(function (val) {
-    return val.cookieString().split("=")[0] === "c_user";
-  });
-
-  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." };
-  }
-
-  if (html.indexOf("/checkpoint/block/?next") > -1) {
-    log.warn("login", "Checkpoint detected. Please log in with a browser to verify.");
-  }
-
-  var userID = maybeCookie[0].cookieString().split("=")[1].toString();
-  try {
-    clearInterval(checkVerified);
-  } catch (_) { }
-
-  var clientID = (Math.random() * 2147483648 | 0).toString(16);
-
-
-  let oldFBMQTTMatch = html.match(/irisSeqID:"(.+?)",appID:219994525426954,endpoint:"(.+?)"/);
-  let mqttEndpoint = null;
-  let region = null;
-  let irisSeqID = null;
-  var noMqttData = null;
-
-  if (oldFBMQTTMatch) {
-    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 {
-    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}`);
-    } 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]}`);*/
-      } else {
-        log.warn("login", "Cannot get MQTT region & sequence ID.");
-        noMqttData = html;
-      }
-    }
-  }
-
-  // All data available to api functions
-  var ctx = {
-    userID: userID,
-    jar: jar,
-    clientID: clientID,
-    globalOptions: globalOptions,
-    loggedIn: true,
-    access_token: 'NONE',
-    clientMutationId: 0,
-    mqttClient: undefined,
-    lastSeqId: irisSeqID,
-    syncToken: undefined,
-    mqttEndpoint,
-    region,
-    firstListen: true
-  };
-
+
+function buildAPI(globalOptions, html, jar) {
+  try {
+    var maybeCookie = jar.getCookies("https://www.facebook.com").filter(function(val) {
+        return val.cookieString().split("=")[0] === "c_user";
+    });
+    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." };
+    if (html.indexOf("/checkpoint/block/?next") > -1) log.warn("login", "Checkpoint detected. Please log in with a browser to verify.");
+    var userID = maybeCookie[0].cookieString().split("=")[1].toString();
+        clearInterval(checkVerified);
+    var clientID = (Math.random() * 2147483648 | 0).toString(16);
+    let oldFBMQTTMatch = html.match(/irisSeqID:"(.+?)",appID:219994525426954,endpoint:"(.+?)"/);
+    let mqttEndpoint = null;
+    let region = null;
+    let irisSeqID = null;
+    var noMqttData = null;
+    if (oldFBMQTTMatch) {
+        irisSeqID = oldFBMQTTMatch[1];
+        mqttEndpoint = oldFBMQTTMatch[2];
+        region = new URL(mqttEndpoint).searchParams.get("region").toUpperCase();
+    } 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();
+        } 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();
+            } else {
+                noMqttData = html;
+                process.exit();
+            }
+        }
+    }
+  } catch (err) {}
+
+  var ctx = {
+        userID: userID,
+        jar: jar,
+        clientID: clientID,
+        globalOptions: globalOptions,
+        loggedIn: true,
+        access_token: 'NONE',
+        clientMutationId: 0,
+        mqttClient: undefined,
+        lastSeqId: irisSeqID,
+        syncToken: undefined,
+        mqttEndpoint,
+        region,
+        firstListen: true
+    };
+  
   var api = {
     setOptions: setOptions.bind(null, globalOptions),
     getAppState: function getAppState() {
@@ -150,9 +133,7 @@ function buildAPI(globalOptions, html, jar) {
     }
   };
 
-  if (noMqttData) {
-    api["htmlData"] = noMqttData;
-  }
+  if (noMqttData) api["htmlData"] = noMqttData;
 
   const apiFuncNames = [
     'addExternalModule',
@@ -214,10 +195,6 @@ function buildAPI(globalOptions, html, jar) {
     api[v] = require('./leiamnash/' + v)(defaultFuncs, api, ctx);
   });
 
-  //Removing original `listen` that uses pull.
-  //Map it to listenMqtt instead for backward compatibly.
-  api.listen = api.listenMqtt;
-
   return [ctx, defaultFuncs, api];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alicezetion",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "",
   "scripts": {
     "lint": "./node_modules/.bin/eslint **.js",