fca-prjvt 3.0.2 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fca-prjvt",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Facebook-chat-api protect and deploy by Kanzu and HZI Team",
   "main": "Index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "ansi-to-html": "latest",
     "assert": "latest",
     "better-sqlite3": "7.6.2",
-    "bluebird": "latest",
+    "bluebird": "^3.7.2",
     "chalk": "4.1.2",
     "cheerio": "latest",
     "crypto-js": "latest",

package/src/listenMqtt.js

@@ -698,46 +698,58 @@ function markDelivery(ctx, api, threadID, messageID) {
 }
 
 module.exports = function (defaultFuncs, api, ctx) {
+    var EventEmitter = require('events');
     var globalCallback = identity;
-    getSeqID = function getSeqID() {
+    var form;
+
+    async function getSeqID() {
         ctx.t_mqttCalled = false;
-        defaultFuncs
-            .post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form)
-            .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-            .then((resData) => {
-                if (utils.getType(resData) != "Array") {
-                    if (global.Fca.Require.FastConfig.AutoLogin) {
-                        return global.Fca.Require.logger.Warning(global.Fca.Require.Language.Index.AutoLogin, function() {
-                            return global.Fca.Action('AutoLogin');
-                        });
-                    }
-                    else if (!global.Fca.Require.FastConfig.AutoLogin) {
-                        return global.Fca.Require.logger.Error(global.Fca.Require.Language.Index.ErrAppState);
-                    }
-                    return;
+
+        try {
+            const resData = await defaultFuncs.post("https://www.facebook.com/api/graphqlbatch/", ctx.jar, form);
+            await utils.parseAndCheckLogin(ctx, defaultFuncs)(resData);
+
+            if (utils.getType(resData) !== "Array") {
+                if (global.Fca.Require.FastConfig.AutoLogin) {
+                    return global.Fca.Require.logger.Warning(global.Fca.Require.Language.Index.AutoLogin, function() {
+                        return global.Fca.Action('AutoLogin');
+                    });
+                } else if (!global.Fca.Require.FastConfig.AutoLogin) {
+                    return global.Fca.Require.logger.Error(global.Fca.Require.Language.Index.ErrAppState);
                 }
-                else {
-                    if (resData && resData[resData.length - 1].error_results > 0) throw resData[0].o0.errors;
-                    if (resData[resData.length - 1].successful_results === 0) throw { error: "getSeqId: there was no successful_results", res: resData };
-                    if (resData[0].o0.data.viewer.message_threads.sync_sequence_id) {
-                        ctx.lastSeqId = resData[0].o0.data.viewer.message_threads.sync_sequence_id;
-                        listenMqtt(defaultFuncs, api, ctx, globalCallback);
-                    } 
-                    else throw { error: "getSeqId: no sync_sequence_id found.", res: resData };
+            } else {
+                if (resData && resData[resData.length - 1].error_results > 0) {
+                    throw resData[0].o0.errors;
                 }
-            })
-            .catch((err) => {
-                log.error("getSeqId", err);
-                if (utils.getType(err) == "Object" && err.error === global.Fca.Require.Language.Index.ErrAppState) ctx.loggedIn = false;
-                return globalCallback(err);
-            });
-    };
+
+                if (resData[resData.length - 1].successful_results === 0) {
+                    throw { error: "getSeqId: there was no successful_results", res: resData };
+                }
+
+                if (resData[0].o0.data.viewer.message_threads.sync_sequence_id) {
+                    ctx.lastSeqId = resData[0].o0.data.viewer.message_threads.sync_sequence_id;
+                    listenMqtt(defaultFuncs, api, ctx, globalCallback);
+                } else {
+                    throw { error: "getSeqId: no sync_sequence_id found.", res: resData };
+                }
+            }
+        } catch (err) {
+            log.error("getSeqId", err);
+
+            if (utils.getType(err) === "Object" && err.error === global.Fca.Require.Language.Index.ErrAppState) {
+                ctx.loggedIn = false;
+            }
+
+            return globalCallback(err);
+        }
+    }
 
     return function (callback) {
         class MessageEmitter extends EventEmitter {
             stopListening(callback) {
-                callback = callback || (() => { });
+                callback = callback || (() => {});
                 globalCallback = identity;
+
                 if (ctx.mqttClient) {
                     ctx.mqttClient.unsubscribe("/webrtc");
                     ctx.mqttClient.unsubscribe("/rtc_multi");
@@ -747,6 +759,7 @@ module.exports = function (defaultFuncs, api, ctx) {
                         ctx.mqttClient = undefined;
                     });
                 }
+
                 global.Fca.Data.StopListening = true;
             }
         }
@@ -757,12 +770,14 @@ module.exports = function (defaultFuncs, api, ctx) {
             msgEmitter.emit("message", message);
         });
 
-        //Reset some stuff
-        if (!ctx.firstListen) ctx.lastSeqId = null;
+        // Reset some stuff
+        if (!ctx.firstListen) {
+            ctx.lastSeqId = null;
+        }
         ctx.syncToken = undefined;
         ctx.t_mqttCalled = false;
 
-        //Same request as getThreadList
+        // Same request as getThreadList
         form = {
             "av": ctx.globalOptions.pageID,
             "queries": JSON.stringify({
@@ -779,9 +794,15 @@ module.exports = function (defaultFuncs, api, ctx) {
             })
         };
 
-        if (!ctx.firstListen || !ctx.lastSeqId) getSeqID();
-        else listenMqtt(defaultFuncs, api, ctx, globalCallback);
-        ctx.firstListen = false;
+        (async () => {
+            if (!ctx.firstListen || !ctx.lastSeqId) {
+                await getSeqID();
+            } else {
+                listenMqtt(defaultFuncs, api, ctx, globalCallback);
+            }
+            ctx.firstListen = false;
+        })();
+
         return msgEmitter;
     };
 };