nexus-fca 2.0.2 → 2.0.3

package/index.js

@@ -256,192 +256,54 @@ function buildAPI(globalOptions, html, jar) {
   };
 }
 
-function loginHelper(appState, email, password, globalOptions, callback, prCallback) {
-  let mainPromise = null;
-  const jar = utils.getJar();
-  
-  // Apply maximum safety validation
-  const safetyCheck = globalSafety.validateLogin(appState, email, password);
-  if (!safetyCheck.safe) {
-    return callback(new Error(`Login Safety Check Failed: ${safetyCheck.reason}`));
-  }
-  
-  // Apply safe user agent from safety module
-  globalOptions.userAgent = globalSafety.getSafeUserAgent();
-  
-  if (appState) {
-    try {
-      appState = JSON.parse(appState);
-    } catch (e) {
-      try {
-        appState = appState;
-      } catch (e) {
-        return callback(new Error("Failed to parse appState"));
-      }
-    }
-
-    try {
-      appState.forEach(c => {
-        const str = `${c.key}=${c.value}; expires=${c.expires}; domain=${c.domain}; path=${c.path};`;
-        jar.setCookie(str, "http://" + c.domain);
-      });
-
-      // Apply safety headers and no delays for maximum safety
-      mainPromise = utils.get('https://www.facebook.com/', jar, null, 
-        globalSafety.applySafeRequestOptions(globalOptions), { noRef: true })
-        .then(utils.saveCookies(jar));
-    } catch (e) {
-      process.exit(0);
-    }
-  } else {
-    mainPromise = utils
-      .get("https://www.facebook.com/", null, null, 
-        globalSafety.applySafeRequestOptions(globalOptions), { noRef: true })
-      .then(utils.saveCookies(jar))
-      .then(makeLogin(jar, email, password, globalOptions, callback, prCallback))
-      .then(() => utils.get('https://www.facebook.com/', jar, null, 
-        globalSafety.applySafeRequestOptions(globalOptions)).then(utils.saveCookies(jar)));
-  }
-
-  function handleRedirect(res) {
-    const reg = /<meta http-equiv="refresh" content="0;url=([^"]+)[^>]+>/;
-    const redirect = reg.exec(res.body);
-    if (redirect && redirect[1]) {
-      return utils.get(redirect[1], jar, null, globalOptions).then(utils.saveCookies(jar));
-    }
-    return res;
-  }
-
-  let ctx, api;
-  mainPromise = mainPromise
-    .then(handleRedirect)
-    .then(res => {
-      const mobileAgentRegex = /MPageLoadClientMetrics/gs;
-      if (!mobileAgentRegex.test(res.body)) {
-        globalOptions.userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36";
-        return utils.get('https://www.facebook.com/', jar, null, globalOptions, { noRef: true }).then(utils.saveCookies(jar));
-      }
-      return res;
-    })
-    .then(handleRedirect)
-    .then(res => {
-      const html = res.body;
-      const Obj = buildAPI(globalOptions, html, jar);
-      ctx = Obj.ctx;
-      api = Obj.api;
-      return res;
-    });
+// --- REPLACE LEGACY LOGIN WITH NEXUS LOGIN SYSTEM ---
+const { nexusLogin } = require('./nexloginsystem');
 
-  if (globalOptions.pageID) {
-    mainPromise = mainPromise
-      .then(() => utils.get(`https://www.facebook.com/${globalOptions.pageID}/messages/?section=messages&subsection=inbox`, jar, null, globalOptions))
-      .then(resData => {
-        let url = utils.getFrom(resData.body, 'window.location.replace("https:\\/\\/www.facebook.com\\', '");').split('\\').join('');
-        url = url.substring(0, url.length - 1);
-        return utils.get('https://www.facebook.com' + url, jar, null, globalOptions);
-      });
-  }
-
-  mainPromise
-    .then(async () => {
-      // Enhanced safety check after login
-      const safetyStatus = globalSafety.validateSession(ctx);
-      if (!safetyStatus.safe) {
-        logger(`⚠️ Login safety warning: ${safetyStatus.reason}`, 'warn');
-      }
-      
-      // No version checking or auto-update for maximum safety and performance
-      logger('Login successful!', 'info');
-      logger('Nexus 2.0 (Enhanced)', 'info');
-      logger('Operating Normally', 'info');
-
-      // Initialize safety monitoring
-      globalSafety.startMonitoring(ctx, api);
-      
-      callback(null, api);
-    })
-    .catch(e => {
-      // Enhanced error handling with safety checks
-      const safetyCheck = globalSafety.checkErrorSafety(e);
-      if (!safetyCheck.safe) {
-        logger(`🚨 SAFETY ALERT: ${safetyCheck.danger} - ${e.message}`, 'error');
-      }
-      
-      callback(e);
-    });
-}
-
-function login(loginData, options, callback) {
-  if (
-    utils.getType(options) === "Function" ||
-    utils.getType(options) === "AsyncFunction"
-  ) {
+/**
+ * Modern login entry point using Nexus Login System
+ * Supports: username/password/2FA, auto appstate, ultra-safe mode
+ * Usage: login({ email, password, twofactor }, options, callback)
+ */
+async function login(loginData, options = {}, callback) {
+  // Support legacy callback signature
+  if (typeof options === 'function') {
     callback = options;
     options = {};
   }
-  const globalOptions = {
-    selfListen: false,
-    selfListenEvent: false,
-    listenEvents: false,
-    listenTyping: false,
-    updatePresence: false,
-    forceLogin: false,
-    autoMarkDelivery: true,
-    autoMarkRead: false,
-    autoReconnect: true,
-    logRecordSize: defaultLogRecordSize,
-    online: true,
-    emitReady: false,
-    userAgent:
-      "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-  };
-  setOptions(globalOptions, options);
-  let prCallback = null;
-  if (
-    utils.getType(callback) !== "Function" &&
-    utils.getType(callback) !== "AsyncFunction"
-  ) {
-    let rejectFunc = null;
-    let resolveFunc = null;
-    var returnPromise = new Promise(function (resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
-    prCallback = function (error, api) {
-      if (error) {
-        return rejectFunc(error);
-      }
-      return resolveFunc(api);
-    };
-    callback = prCallback;
+  // Use Nexus Login System for all logins
+  try {
+    const result = await nexusLogin({
+      username: loginData.email || loginData.username,
+      password: loginData.password,
+      twofactor: loginData.twofactor || loginData.otp || undefined,
+      appstate: loginData.appState || loginData.appstate || undefined
+    }, options);
+    if (result.success && result.api) {
+      if (callback) return callback(null, result.api);
+      return result.api;
+    } else {
+      if (callback) return callback(new Error(result.message || 'Login failed'));
+      throw new Error(result.message || 'Login failed');
+    }
+  } catch (error) {
+    log.error('login', "Lỗi không xác định, vui lòng thử lại sau: " + error.message);
+    if (callback) return callback(error);
   }
-  
-  // Initialize enhanced systems before login
-  enhancedDatabase.initialize().catch(err => {
-    logger('Failed to initialize enhanced database:', err);
-  });
-  
-  loginHelper(
-    loginData.appState,
-    loginData.email,
-    loginData.password,
-    globalOptions,
-    callback,
-    prCallback
-  );
-  return returnPromise;
 }
 
-const enhancedDatabase = new EnhancedDatabase();
-
-// Enhanced exports
-module.exports = login;
-module.exports.NexusClient = NexusClient;
-module.exports.PerformanceManager = PerformanceManager;
-module.exports.ErrorHandler = ErrorHandler;
-module.exports.AdvancedMqttManager = AdvancedMqttManager;
-module.exports.EnhancedDatabase = EnhancedDatabase;
-module.exports.CompatibilityLayer = CompatibilityLayer;
-module.exports.Message = Message;
-module.exports.Thread = Thread;
-module.exports.User = User;
+module.exports = {
+  buildAPI,
+  login,
+  setOptions,
+  utils,
+  logger,
+  FacebookSafety,
+  CompatibilityLayer,
+  PerformanceManager,
+  ErrorHandler,
+  AdvancedMqttManager,
+  EnhancedDatabase,
+  Message,
+  Thread,
+  User
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexus-fca",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A modern, safe, and advanced Facebook Chat API for Node.js with enhanced performance, smart caching, and TypeScript support. Messenger automation, bots, and integrations made easy.",
   "main": "index.js",
   "repository": {