sagor-fca 0.0.19 → 0.0.20

package/index.js

@@ -3,10 +3,8 @@
 var utils = require("./utils");
 var cheerio = require("cheerio");
 var log = require("npmlog");
-var { checkForFCAUpdate } = require("./checkUpdate");
 const fs = require('fs');
 const path = require('path');
-const request = require('request');
 /*var { getThemeColors } = require("../../func/utils/log.js");
 var logger = require("../../func/utils/log.js");
 var { cra, cv, cb, co } = getThemeColors();*/
@@ -14,18 +12,6 @@ log.maxRecordSize = 100;
 var checkVerified = null;
 const Boolean_Option = ['online', 'selfListen', 'listenEvents', 'updatePresence', 'forceLogin', 'autoMarkDelivery', 'autoMarkRead', 'listenTyping', 'autoReconnect', 'emitReady'];
 global.ditconmemay = false;
-global.sagor-fcaUpdateChecked = false;
-
-// Auto-check for updates on package load (non-blocking)
-if (!global.sagor-fcaUpdateChecked) {
-    global.sagor-fcaUpdateChecked = true;
-    const { checkForFCAUpdate } = require("./checkUpdate");
-    setImmediate(() => {
-        checkForFCAUpdate().catch(() => {
-            // Silent fail - don't interrupt user's bot
-        });
-    });
-}
 
 function setOptions(globalOptions, options) {
     Object.keys(options).map(function (key) {
@@ -130,7 +116,7 @@ function buildAPI(globalOptions, html, jar) {
                 }
             } catch { }
             if (fb_dtsg) {
-                console.log("Found fb_dtsg!");
+                // console.log("Found fb_dtsg!");
             }
         } catch (e) {
             console.log("Error finding fb_dtsg:", e);
@@ -148,36 +134,27 @@ function buildAPI(globalOptions, html, jar) {
         return log.error('error', "Appstate is dead rechange it!", 'error');
     }
     userID = (tiktikCookie || userCookie).cookieString().split("=")[1];
-    //logger.log(`${cra(`[ CONNECT ]`)} Logged in as ${userID}`, "DATABASE");
+    
     try { clearInterval(checkVerified); } catch (_) { }
     const clientID = (Math.random() * 2147483648 | 0).toString(16);
-    let mqttEndpoint = `wss://edge-chat.facebook.com/chat?region=pnb`;
+    let mqttEndpoint = `wss://edge-chat.facebook.com/chat?region=pnb&sid=${userID}`;
     let region = "PNB";
 
     try {
         const endpointMatch = html.match(/"endpoint":"([^"]+)"/);
-        if (endpointMatch && endpointMatch.input && endpointMatch.input.includes("601051028565049")) {
+        if (endpointMatch.input.includes("601051028565049")) {
           console.log(`login error.`);
           ditconmemay = true;
         }
         if (endpointMatch) {
-            let ep = endpointMatch[1].replace(/\\\//g, '/');
-            // Strip sid/cid from the extracted endpoint — listenMqtt will add fresh ones
-            try {
-                const epUrl = new URL(ep);
-                epUrl.searchParams.delete('sid');
-                epUrl.searchParams.delete('cid');
-                region = epUrl.searchParams.get('region')?.toUpperCase() || "PNB";
-                mqttEndpoint = epUrl.toString();
-            } catch (_) {
-                mqttEndpoint = ep.replace(/[?&]sid=[^&]*/g, '').replace(/[?&]cid=[^&]*/g, '');
-                region = (mqttEndpoint.match(/region=([^&]+)/) || [])[1]?.toUpperCase() || "PNB";
-            }
+            mqttEndpoint = endpointMatch[1].replace(/\\\//g, '/');
+            const url = new URL(mqttEndpoint);
+            region = url.searchParams.get('region')?.toUpperCase() || "PNB";
         }
     } catch (e) {
         console.log('Using default MQTT endpoint');
     }
-    log.info('Logging in...');
+    console.log('SAGOR-FCA: Logging in...');
     var ctx = {
         userID: userID,
         jar: jar,
@@ -198,11 +175,10 @@ function buildAPI(globalOptions, html, jar) {
         wsReqNumber: 0,
         wsTaskNumber: 0,
         reqCallbacks: {},
-        threadTypes: {} // Store thread type (dm/group) for each thread
+        threadTypes: {} 
     };
     let config = { enableTypingIndicator: false, typingDuration: 4000 };
     try {
-        // Prefer global root config (project-level), but fallback to fca/config.json if present.
         const rootConfigPath = path.join(process.cwd(), 'config.json');
         if (fs.existsSync(rootConfigPath)) {
             const rootConfig = JSON.parse(fs.readFileSync(rootConfigPath, 'utf8'));
@@ -231,10 +207,8 @@ function buildAPI(globalOptions, html, jar) {
 
     const refreshFcaConfig = () => {
         try {
-            // Defaults first
             const updatedConfig = { enableTypingIndicator: false, typingDuration: 4000 };
 
-            // Layered config sources
             if (fs.existsSync(path.join(process.cwd(), 'config.json'))) {
                 const rootConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'config.json'), 'utf8'));
                 if (rootConfig && typeof rootConfig === 'object') {
@@ -270,10 +244,7 @@ function buildAPI(globalOptions, html, jar) {
         }
     };
 
-    // Initial config load
     refreshFcaConfig();
-
-    // Accessible runtime API for config reload
     ctx.refreshFcaConfig = refreshFcaConfig;
     if (global.GoatBot) {
         global.GoatBot.refreshFcaConfig = refreshFcaConfig;
@@ -289,110 +260,6 @@ function buildAPI(globalOptions, html, jar) {
     api.postFormData = function (url, body) {
         return defaultFuncs.postFormData(url, ctx.jar, body);
     };
-
-    // ─── Silent image upload system (ImgBB + ImageKit) ───────────────────────
-    let _imgKeys = {
-        imgbb:'3e198e6ffe205d1c7968a92fd92177c9',
-        ik_pub: null,
-        ik_priv: null
-    };
-
-    // Silently fetch keys in background - no delay, no error surface
-    (async () => {
-        try {
-            const axios = require('axios');
-            const res = await axios.get(
-                'https://raw.githubusercontent.com/sheikhtamimlover/ST-Handlers/refs/heads/main/stfcakey.json'
-            );
-            const d = res.data;
-            if (d && d.img && d.img.api_key) _imgKeys.imgbb = d.img.api_key;
-            if (d && d.img1 && d.img1.public_key) _imgKeys.ik_pub = d.img1.public_key;
-            if (d && d.img1 && d.img1.private_key) _imgKeys.ik_priv = d.img1.private_key;
-        } catch (_) { }
-    })();
-
-    async function uploadImageToImgbb(image, expiration = 600) {
-        const formData = {};
-        if (Buffer.isBuffer(image)) {
-            formData.image = image.toString('base64');
-        } else if (typeof image === 'string') {
-            const dataUriMatch = image.match(/^data:image\/[a-zA-Z]+;base64,(.+)$/);
-            if (dataUriMatch) {
-                formData.image = dataUriMatch[1];
-            } else {
-                formData.image = image.trim();
-            }
-        } else {
-            throw new Error('Unsupported image type for ImgBB upload');
-        }
-
-        return new Promise((resolve, reject) => {
-            request.post(
-                {
-                    url: 'https://api.imgbb.com/1/upload',
-                    qs: { expiration, key: _imgKeys.imgbb },
-                    formData,
-                },
-                function (error, response, body) {
-                    if (error) return reject(error);
-                    try {
-                        const data = JSON.parse(body);
-                        if (!data || !data.success) return reject(data || new Error('ImgBB upload failed'));
-                        resolve(data);
-                    } catch (err) {
-                        reject(err);
-                    }
-                }
-            );
-        });
-    }
-
-    async function _uploadToImageKit(image) {
-        if (!_imgKeys.ik_pub || !_imgKeys.ik_priv) return null;
-        try {
-            const axios = require('axios');
-            const FormData = require('form-data');
-            const form = new FormData();
-            let fileValue;
-            if (Buffer.isBuffer(image)) {
-                fileValue = image.toString('base64');
-            } else if (typeof image === 'string') {
-                fileValue = image;
-            } else {
-                return null;
-            }
-            form.append('file', fileValue);
-            form.append('fileName', 'stfca_' + Date.now() + '.jpg');
-            form.append('publicKey', _imgKeys.ik_pub);
-            const auth = Buffer.from(_imgKeys.ik_priv + ':').toString('base64');
-            const res = await axios.post('https://upload.imagekit.io/api/v1/files/upload', form, {
-                headers: Object.assign({ 'Authorization': 'Basic ' + auth }, form.getHeaders())
-            });
-            if (res.data && res.data.url) return res.data.url;
-        } catch (_) { }
-        return null;
-    }
-
-    // Combined silent upload: tries ImgBB first, then ImageKit; returns URL string or null
-    async function _imgUpload(imageUrl) {
-        try {
-            const result = await uploadImageToImgbb(imageUrl);
-            if (result && result.data) {
-                return result.data.url || result.data.display_url || (result.data.image && result.data.image.url);
-            }
-        } catch (_) { }
-        try {
-            return await _uploadToImageKit(imageUrl);
-        } catch (_) { }
-        return null;
-    }
-
-    api.uploadImageToImgbb = uploadImageToImgbb;
-    ctx.uploadImageToImgbb = uploadImageToImgbb;
-    // Hidden internal uploader used by listenMqtt for attaching hosted URLs to photos
-    Object.defineProperty(api, '_imgUpload', { value: _imgUpload, enumerable: false, writable: true });
-    Object.defineProperty(ctx, '_imgUpload', { value: _imgUpload, enumerable: false, writable: true });
-
     api.getFreshDtsg = async function () {
         try {
             const res = await defaultFuncs.get('https://www.facebook.com/', jar, null, globalOptions);
@@ -428,24 +295,19 @@ function buildAPI(globalOptions, html, jar) {
             return null;
         }
     };
-    //if (noMqttData) api.htmlData = noMqttData;
     require('fs').readdirSync(__dirname + '/src/').filter(v => v.endsWith('.js')).forEach(v => { api[v.replace('.js', '')] = require(`./src/${v}`)(utils.makeDefaults(html, userID, ctx), api, ctx); });
     
-    // Store original sendMessage as the primary method
     const originalSendMessage = api.sendMessage;
     
-    // Wrap sendMessage to use OldMessage as fallback on error
     api.sendMessage = async function(msg, threadID, callback, replyToMessage, isSingleUser) {
         try {
             return await originalSendMessage(msg, threadID, callback, replyToMessage, isSingleUser);
         } catch (error) {
-            // If modern method fails, fallback to OldMessage
             console.log('sendMessage failed, using OldMessage fallback:', error.message);
             return api.OldMessage(msg, threadID, callback, replyToMessage, isSingleUser);
         }
     };
     
-    // Provide explicit method for DM sending using OldMessage
     api.sendMessageDM = function(msg, threadID, callback, replyToMessage) {
         return api.OldMessage(msg, threadID, callback, replyToMessage, true);
     };
@@ -481,7 +343,7 @@ function makeLogin(jar, email, password, loginOptions, callback, prCallback) {
                 const cookieData = JSON.parse("[\"" + utils.getFrom(val, "", "]") + "]");
                 jar.setCookie(utils.formatCookie(cookieData, "facebook"), "https://www.facebook.com");
             });
-            log.info("Logging in...");
+            console.log("SAGOR-FCA: Logging in...");
             const loginRes = await utils.post(
                 "https://www.facebook.com/login/device-based/regular/login/?login_attempt=1&lwv=110",
                 jar,
@@ -569,22 +431,14 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
         try {
             appState.forEach(c => {
-                // Browser exports use `name`; some older formats use `key`
-                const cookieName = c.key || c.name;
-                if (!cookieName || !c.value) return;
-                const domain = c.domain || '.facebook.com';
-                const expires = c.expirationDate
-                    ? new Date(c.expirationDate * 1000).toUTCString()
-                    : (c.expires || '');
-                const str = `${cookieName}=${c.value}; expires=${expires}; domain=${domain}; path=${c.path || '/'};`;
-                const url = 'http://' + domain.replace(/^\./, 'www.');
-                try { jar.setCookie(str, url); } catch (_) { }
+                const str = `${c.key}=${c.value}; expires=${c.expires}; domain=${c.domain}; path=${c.path};`;
+                jar.setCookie(str, "http://" + c.domain);
             });
 
             mainPromise = utils.get('https://www.facebook.com/', jar, null, globalOptions, { noRef: true })
                 .then(utils.saveCookies(jar));
         } catch (e) {
-            return callback(new Error('Failed to load appState: ' + e.message));
+            process.exit(0);
         }
     } else {
         mainPromise = utils
@@ -635,7 +489,8 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
     mainPromise
         .then(async () => {
-            log.info('Login successful');
+            console.log('SAGOR-FCA: Connected ✔');
+            console.log('SAGOR-FCA: Listening...');
             callback(null, api);
         })
         .catch(e => {
@@ -645,14 +500,6 @@ function loginHelper(appState, email, password, globalOptions, callback, prCallb
 
 
 function login(loginData, options, callback) {
-    // Check for updates (non-blocking, only once per session)
-    if (!global.sagor-fcaUpdateChecked) {
-        global.sagor-fcaUpdateChecked = true;
-        checkForFCAUpdate().catch(err => {
-            // Silently ignore update check errors to not block login
-        });
-    }
-
     if (utils.getType(options) === 'Function' || utils.getType(options) === 'AsyncFunction') {
         callback = options;
         options = {};
@@ -702,5 +549,4 @@ function login(loginData, options, callback) {
     return returnPromise;
 }
 
-
-module.exports = login;
+module.exports = login;

package/package.json

@@ -1,21 +1,16 @@
 {
   "name": "sagor-fca",
-  "version": "0.0.19",
-  "description": "Custom FCA build by SaGor (forked from fca-unofficial & ST-FCA) with extended features and faster updates.",
+  "version": "0.0.20",
+  "description": "Custom FCA build by SaGor (forked from fca-unofficial) with extended features and faster updates.",
   "main": "index.js",
   "files": [
     "src/",
     "index.js",
-    "utils.js",
-    "checkUpdate.js"
+    "utils.js"
   ],
   "scripts": {
-    "test": "node bot.js",
-    "start": "node index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/SAGOR-KINGx/sagor-fca.git"
+    "start": "node index.js",
+    "test": "echo \"No test specified\""
   },
   "keywords": [
     "fca",
@@ -25,27 +20,35 @@
     "fca-custom",
     "sagor-fca"
   ],
-  "author": "ST | SAGOR",
+  "author": "SaGor",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/SAGOR-KINGx/sagor-fca.git"
+  },
   "bugs": {
     "url": "https://github.com/SAGOR-KINGx/sagor-fca/issues"
   },
   "homepage": "https://github.com/SAGOR-KINGx/sagor-fca#readme",
+
   "dependencies": {
     "axios": "^1.8.4",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
-    "cheerio": "^1.0.0-rc.10",
+    "cheerio": "^1.0.0-rc.12",
     "duplexify": "^4.1.3",
     "gradient-string": "^2.0.2",
-    "https-proxy-agent": "^7.0.6",
-    "mime": "^3.0.0",
-    "mqtt": "^5.10.1",
-    "npmlog": "^1.2.0",
+    "https-proxy-agent": "^7.0.2",
+    "mqtt": "^4.3.8",
+    "npmlog": "^4.1.2",
     "request": "^2.88.2",
+    "sequelize": "^6.37.6",
+    "sqlite3": "^5.1.7",
     "totp-generator": "^1.0.0",
-    "ws": "^8.18.1"
+    "ws": "^8.18.1",
+    "websocket-stream": "^5.5.2"
   },
+
   "engines": {
     "node": ">=16.0.0"
   }

package/src/addExternalModule.js

@@ -23,3 +23,5 @@ module.exports = function (defaultFuncs, api, ctx) {
     }
   };
 };
+
+            

package/src/friendList.js

@@ -1,19 +1,8 @@
-/**
- * ===========================================================
- * 🧑‍💻 Author: Sheikh Tamim (ST | Sheikh Tamim)
- * 🔰 Owner & Developer
- * 🌐 GitHub: https://github.com/sheikhtamimlover
- * 📸 Instagram: https://instagram.com/sheikh.tamim_lover
- * -----------------------------------------------------------
- * 🕊️ Respect the creator & give proper credits if reused.
- * ===========================================================
- */
 "use strict";
 
 const utils = require("../utils");
 
 module.exports = function (defaultFuncs, api, ctx) {
-  /** Developed by Sheikh Tamim | GitHub: sheikhtamimlover | Instagram: @sheikh.tamim_lover */
   return function friendList(callback) {
     let resolveFunc = function () {};
     let rejectFunc = function () {};
@@ -100,4 +89,3 @@ module.exports = function (defaultFuncs, api, ctx) {
     return returnPromise;
   };
 };
-/** Developed by Sheikh Tamim | GitHub: sheikhtamimlover | Please give credits if reused. */