alicezetion 1.5.0 → 1.5.2

package/.cache/replit/__replit_disk_meta.json

@@ -1 +1 @@
-{"nonce":3763463497230534835,"last_updated":{"seconds":1693558152,"nanos":617107000}}
+{"nonce":5196796132528607608,"last_updated":{"seconds":1693559125,"nanos":786672000}}

package/Main.js

@@ -263,8 +263,9 @@ function setOptions(globalOptions, options) {
  * @param {{ getCookies: (arg0: string) => any[]; }} jar
  */
 
+/*
 function buildAPI(globalOptions, html, jar) {
-    var maybeCookie = jar.getCookies("https://www.facebook.com").filter(function(/** @type {{ cookieString: () => string; }} */val) { return val.cookieString().split("=")[0] === "c_user"; });
+    var maybeCookie = jar.getCookies("https://www.facebook.com").filter(function(/** @type {{ cookieString: () => string; }} val) { return val.cookieString().split("=")[0] === "c_user"; });
 
     if (maybeCookie.length === 0) {
         if (global.Fca.Require.FastConfig.AutoLogin) {
@@ -275,17 +276,17 @@ function buildAPI(globalOptions, html, jar) {
         else if (!global.Fca.Require.FastConfig.AutoLogin) {
             return global.Fca.Require.logger.Error(global.Fca.Require.Language.Index.ErrAppState);
         }
-    }
+    }*/
+/*
     else {
-       // if (html.indexOf("/checkpoint/block/?next") > -1) log.warn("login", Language.CheckPointLevelI);
+        if (html.indexOf("/checkpoint/block/?next") > -1) log.warn("login", Language.CheckPointLevelI);
 
         var userID = maybeCookie[0].cookieString().split("=")[1].toString();
-        process.env['UID'] = //logger.Normal(getText(Language.UID,userID), userID);
+        process.env['UID'] = logger.Normal(getText(Language.UID,userID), userID);
 
     clearInterval(checkVerified);
 
         var clientID = (Math.random() * 2147483648 | 0).toString(16);
-  /*
         var CHECK_MQTT = {
             oldFBMQTTMatch: html.match(/irisSeqID:"(.+?)",appID:219994525426954,endpoint:"(.+?)"/),
             newFBMQTTMatch: html.match(/{"app_id":"219994525426954","endpoint":"(.+?)","iris_seq_id":"(.+?)"}/),
@@ -318,7 +319,7 @@ function buildAPI(globalOptions, html, jar) {
                 }
             return;
             }
-        });    */
+        });    
 
         var ctx = {
             userID: userID,
@@ -331,10 +332,74 @@ function buildAPI(globalOptions, html, jar) {
             mqttClient: undefined,
             lastSeqId: undefined, //irisSeqID
             syncToken: undefined,
-            mqttEndpoint: mqttEndpoint,
-            region: region,
+            mqttEndpoint: undefined, //mqttEndpoint
+            region: undefined, //region
             firstListen: true
         };
+      */
+
+
+
+ // LeiamNash » modified starts
+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();
+  } 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;
+      }
+    }
+  }
+
+  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
+  };
+// LeiamNash modified ends
 
         var api = {
             setOptions: setOptions.bind(null, globalOptions),
@@ -353,7 +418,7 @@ function buildAPI(globalOptions, html, jar) {
 
         var defaultFuncs = utils.makeDefaults(html, userID, ctx);
 
-        fs.readdirSync(__dirname + "/src").filter((/** @type {string} */File) => File.endsWith(".js") && !File.includes('Dev_')).map((/** @type {string} */File) => { 
+        fs.readdirSync(__dirname + "/leiamnash").filter((/** @type {string} */File) => File.endsWith(".js") && !File.includes('Dev_')).map((/** @type {string} */File) => { 
             if (File == 'getThreadInfo.js' && global.Fca.Require.FastConfig.AntiGetInfo.AntiGetThreadInfo != true || File == 'getUserInfo.js'  && global.Fca.Require.FastConfig.AntiGetInfo.AntiGetUserInfo != true) api[File.split('.').slice(0, -1).join('.')] = require('./leiamnash/' + (File.includes('getThreadInfo') ? 'getThreadMain.js' : 'getUserInfoMain.js'))(defaultFuncs, api, ctx)
             else api[File.split('.').slice(0, -1).join('.')] = require('./leiamnash/' + File)(defaultFuncs, api, ctx)
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alicezetion",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "",
   "main": "index.js",
   "scripts": {