@dongdev/fca-unofficial 2.0.7 → 2.0.8

package/src/api/messaging/sendMessageMqtt.js

@@ -1,7 +1,9 @@
-const utils = require("../../utils");
+
 var log = require("npmlog");
 var bluebird = require("bluebird");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
+const { isReadableStream } = require("../../utils/constants");
 module.exports = function(defaultFuncs, api, ctx) {
   function uploadAttachment(attachments, callback) {
     callback = callback || function() {};
@@ -9,11 +11,11 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     // create an array of promises
     for (var i = 0; i < attachments.length; i++) {
-      if (!utils.isReadableStream(attachments[i])) {
+      if (!isReadableStream(attachments[i])) {
         throw {
           error:
             "Attachment should be a readable stream and not " +
-            utils.getType(attachments[i]) +
+            getType(attachments[i]) +
             "."
         };
       }
@@ -31,7 +33,7 @@ module.exports = function(defaultFuncs, api, ctx) {
             form,
             {}
           )
-          .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+          .then(parseAndCheckLogin(ctx, defaultFuncs))
           .then(function(resData) {
             if (resData.error) {
               throw resData;
@@ -105,7 +107,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       form.payload.tasks[0].payload.attachment_fbids = [];
       if (form.payload.tasks[0].payload.text == "")
         form.payload.tasks[0].payload.text = null;
-      if (utils.getType(msg.attachment) !== "Array") {
+      if (getType(msg.attachment) !== "Array") {
         msg.attachment = [msg.attachment];
       }
 
@@ -228,12 +230,12 @@ module.exports = function(defaultFuncs, api, ctx) {
   return function sendMessageMqtt(msg, threadID, callback, replyToMessage) {
     if (
       !callback &&
-      (utils.getType(threadID) === "Function" ||
-        utils.getType(threadID) === "AsyncFunction")
+      (getType(threadID) === "Function" ||
+        getType(threadID) === "AsyncFunction")
     ) {
       return threadID({ error: "Pass a threadID as a second argument." });
     }
-    if (!replyToMessage && utils.getType(callback) === "String") {
+    if (!replyToMessage && getType(callback) === "String") {
       replyToMessage = callback;
       callback = function() {};
     }
@@ -242,9 +244,9 @@ module.exports = function(defaultFuncs, api, ctx) {
       callback = function(err, friendList) {};
     }
 
-    var msgType = utils.getType(msg);
-    var threadIDType = utils.getType(threadID);
-    var messageIDType = utils.getType(replyToMessage);
+    var msgType = getType(msg);
+    var threadIDType = getType(threadID);
+    var messageIDType = getType(replyToMessage);
 
     if (msgType !== "String" && msgType !== "Object") {
       return callback({

package/src/api/messaging/sendTypingIndicator.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { getType } = require("../../utils/format");
+const { parseAndCheckLogin } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   function makeTypingIndicator(typ, threadID, callback, isGroup) {
     const form = {
@@ -14,13 +14,13 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     // Check if thread is a single person chat or a group chat
     // More info on this is in api.sendMessage
-    if (utils.getType(isGroup) == "Boolean") {
+    if (getType(isGroup) == "Boolean") {
       if (!isGroup) {
         form.to = threadID;
       }
       defaultFuncs
         .post("https://www.facebook.com/ajax/messaging/typ.php", ctx.jar, form)
-        .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+        .then(parseAndCheckLogin(ctx, defaultFuncs))
         .then(function(resData) {
           if (resData.error) {
             throw resData;
@@ -30,7 +30,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         })
         .catch(function(err) {
           log.error("sendTypingIndicator", err);
-          if (utils.getType(err) == "Object" && err.error === "Not logged in") {
+          if (getType(err) == "Object" && err.error === "Not logged in") {
             ctx.loggedIn = false;
           }
           return callback(err);
@@ -52,7 +52,7 @@ module.exports = function(defaultFuncs, api, ctx) {
             ctx.jar,
             form
           )
-          .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+          .then(parseAndCheckLogin(ctx, defaultFuncs))
           .then(function(resData) {
             if (resData.error) {
               throw resData;
@@ -63,7 +63,7 @@ module.exports = function(defaultFuncs, api, ctx) {
           .catch(function(err) {
             log.error("sendTypingIndicator", err);
             if (
-              utils.getType(err) == "Object" &&
+              getType(err) == "Object" &&
               err.error === "Not logged in."
             ) {
               ctx.loggedIn = false;
@@ -76,8 +76,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
   return function sendTypingIndicator(threadID, callback, isGroup) {
     if (
-      utils.getType(callback) !== "Function" &&
-      utils.getType(callback) !== "AsyncFunction"
+      getType(callback) !== "Function" &&
+      getType(callback) !== "AsyncFunction"
     ) {
       if (callback) {
         log.warn(
@@ -92,8 +92,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     return function end(cb) {
       if (
-        utils.getType(cb) !== "Function" &&
-        utils.getType(cb) !== "AsyncFunction"
+        getType(cb) !== "Function" &&
+        getType(cb) !== "AsyncFunction"
       ) {
         if (cb) {
           log.warn(

package/src/api/messaging/setMessageReaction.js

@@ -1,119 +1,105 @@
 "use strict";
 
-const utils = require("../../utils");
-var log = require("npmlog");
-const { generateOfflineThreadingID } = require("../../utils");
+const log = require("npmlog");
+const { generateOfflineThreadingID, getCurrentTimestamp } = require("../../utils/format");
+const { parseAndCheckLogin } = require("../../utils/client");
 
-module.exports = function(defaultFuncs, api, ctx) {
-  function setMessageReactionNoMqtt(reaction, messageID, callback) {
-    var resolveFunc = function() {};
-    var rejectFunc = function() {};
-    var returnPromise = new Promise(function(resolve, reject) {
+module.exports = function (defaultFuncs, api, ctx) {
+  function setMessageReactionNoMqtt(reaction, messageID, threadID, callback) {
+    let resolveFunc = function () { };
+    let rejectFunc = function () { };
+    const returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
     if (!callback) {
-      callback = function(err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err) {
+        if (err) return rejectFunc(err);
+        resolveFunc();
       };
     }
-    var variables = {
+    const variables = {
       data: {
         client_mutation_id: ctx.clientMutationId++,
         actor_id: ctx.userID,
-        action: reaction == "" ? "REMOVE_REACTION" : "ADD_REACTION",
+        action: reaction === "" ? "REMOVE_REACTION" : "ADD_REACTION",
         message_id: messageID,
         reaction: reaction
       }
     };
-    var qs = {
+    const qs = {
       doc_id: "1491398900900362",
       variables: JSON.stringify(variables),
       dpr: 1
     };
     defaultFuncs
-      .postFormData(
-        "https://www.facebook.com/webgraphql/mutation/",
-        ctx.jar,
-        {},
-        qs
-      )
-      .then(utils.parseAndCheckLogin(ctx.jar, defaultFuncs))
-      .then(function(resData) {
-        if (!resData) {
-          throw { error: "setReaction returned empty object." };
-        }
-        if (resData.error) {
-          throw resData;
-        }
+      .postFormData("https://www.facebook.com/webgraphql/mutation/", ctx.jar, {}, qs)
+      .then(parseAndCheckLogin(ctx.jar, defaultFuncs))
+      .then(function (resData) {
+        if (!resData) throw { error: "setReaction returned empty object." };
+        if (resData.error) throw resData;
         callback(null);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("setReaction", err);
         return callback(err);
       });
-
     return returnPromise;
   }
 
   function setMessageReactionMqtt(reaction, messageID, threadID, callback) {
-    if (!ctx.mqttClient) {
-      throw new Error("Not connected to MQTT");
-    }
-    ctx.wsReqNumber += 1;
-    let taskNumber = ++ctx.wsTaskNumber;
-    const taskPayload = {
-      thread_key: threadID,
-      timestamp_ms: getCurrentTimestamp(),
-      message_id: messageID,
-      reaction: reaction,
-      actor_id: ctx.userID,
-      reaction_style: null,
-      sync_group: 1,
-      send_attribution: Math.random() < 0.5 ? 65537 : 524289
-    };
-    const task = {
-      failure_count: null,
-      label: "29",
-      payload: JSON.stringify(taskPayload),
-      queue_name: JSON.stringify(["reaction", messageID]),
-      task_id: taskNumber
-    };
-    const content = {
-      app_id: "2220391788200892",
-      payload: JSON.stringify({
-        data_trace_id: null,
-        epoch_id: parseInt(generateOfflineThreadingID()),
-        tasks: [task],
-        version_id: "7158486590867448"
-      }),
-      request_id: ctx.wsReqNumber,
-      type: 3
-    };
-    if (typeof callback === "function") {
-      ctx["tasks"].set(taskNumber, {
-        type: "set_message_reaction",
-        callback: callback
-      });
-    }
-    ctx.mqttClient.publish("/ls_req", JSON.stringify(content), {
-      qos: 1,
-      retain: false
+    if (!ctx.mqttClient) return setMessageReactionNoMqtt(reaction, messageID, callback);
+    return new Promise((resolve, reject) => {
+      try {
+        ctx.wsReqNumber += 1;
+        const taskNumber = ++ctx.wsTaskNumber;
+        const taskPayload = {
+          thread_key: threadID,
+          timestamp_ms: getCurrentTimestamp(),
+          message_id: messageID,
+          reaction: reaction,
+          actor_id: ctx.userID,
+          reaction_style: null,
+          sync_group: 1,
+          send_attribution: Math.random() < 0.5 ? 65537 : 524289
+        };
+        const task = {
+          failure_count: null,
+          label: "29",
+          payload: JSON.stringify(taskPayload),
+          queue_name: JSON.stringify(["reaction", messageID]),
+          task_id: taskNumber
+        };
+        const content = {
+          app_id: "2220391788200892",
+          payload: JSON.stringify({
+            data_trace_id: null,
+            epoch_id: parseInt(generateOfflineThreadingID()),
+            tasks: [task],
+            version_id: "7158486590867448"
+          }),
+          request_id: ctx.wsReqNumber,
+          type: 3
+        };
+        const internalCb = (err) => {
+          if (typeof callback === "function") callback(err);
+          if (err) return reject(err);
+          return resolve();
+        };
+        ctx.tasks.set(taskNumber, { type: "set_message_reaction", callback: internalCb });
+        ctx.mqttClient.publish("/ls_req", JSON.stringify(content), { qos: 1, retain: false });
+        if (typeof callback !== "function") resolve();
+      } catch (e) {
+        if (typeof callback === "function") callback(e);
+        reject(e);
+      }
     });
   }
+
   return function setMessageReaction(reaction, messageID, threadID, callback) {
     if (ctx.mqttClient) {
-      try {
-        setMessageReactionMqtt(reaction, messageID, threadID, callback);
-        callback();
-      } catch (e) {
-        setMessageReactionNoMqtt(reaction, messageID, callback);
-      }
-    } else {
-      setMessageReactionNoMqtt(reaction, messageID, callback);
+      return setMessageReactionMqtt(reaction, messageID, threadID, callback);
     }
+    return setMessageReactionNoMqtt(reaction, messageID, threadID, callback);
   };
 };

package/src/api/messaging/setTitle.js

@@ -1,44 +1,34 @@
 "use strict";
 
-const utils = require("../../utils");
+const { getType, generateOfflineThreadingID, generateTimestampRelative, generateThreadingID, getCurrentTimestamp } = require("../../utils/format");
+const { parseAndCheckLogin } = require("../../utils/client");
 const log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
-  return function setTitle(newTitle, threadID, callback) {
-    if (
-      !callback &&
-      (utils.getType(threadID) === "Function" ||
-        utils.getType(threadID) === "AsyncFunction")
-    ) {
-      throw { error: "please pass a threadID as a second argument." };
-    }
-
-    let resolveFunc = function() {};
-    let rejectFunc = function() {};
-    const returnPromise = new Promise(function(resolve, reject) {
+module.exports = function (defaultFuncs, api, ctx) {
+  function setTitleNoMqtt(newTitle, threadID, callback) {
+    if (!callback && (getType(threadID) === "Function" || getType(threadID) === "AsyncFunction")) throw { error: "please pass a threadID as a second argument." };
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
       resolveFunc = resolve;
       rejectFunc = reject;
     });
-
     if (!callback) {
-      callback = function(err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
       };
     }
-
-    const messageAndOTID = utils.generateOfflineThreadingID();
-    const form = {
+    var messageAndOTID = generateOfflineThreadingID();
+    var form = {
       client: "mercury",
       action_type: "ma-type:log-message",
-      author: "fbid:" + (ctx.i_userID || ctx.userID),
+      author: "fbid:" + ctx.userID,
       author_email: "",
       coordinates: "",
       timestamp: Date.now(),
       timestamp_absolute: "Today",
-      timestamp_relative: utils.generateTimestampRelative(),
+      timestamp_relative: generateTimestampRelative(),
       timestamp_time_passed: "0",
       is_unread: false,
       is_cleared: false,
@@ -50,41 +40,80 @@ module.exports = function(defaultFuncs, api, ctx) {
       status: "0",
       offline_threading_id: messageAndOTID,
       message_id: messageAndOTID,
-      threading_id: utils.generateThreadingID(ctx.clientID),
+      threading_id: generateThreadingID(ctx.clientID),
       manual_retry_cnt: "0",
       thread_fbid: threadID,
       thread_name: newTitle,
       thread_id: threadID,
       log_message_type: "log:thread-name"
     };
-
     defaultFuncs
-      .post(
-        "https://www.facebook.com/messaging/set_thread_name/",
-        ctx.jar,
-        form
-      )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error && resData.error === 1545012) {
-          throw { error: "Cannot change chat title: Not member of chat." };
-        }
-
-        if (resData.error && resData.error === 1545003) {
-          throw { error: "Cannot set title of single-user chat." };
-        }
-
-        if (resData.error) {
-          throw resData;
-        }
-
+      .post("https://www.facebook.com/messaging/set_thread_name/", ctx.jar, form)
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
+      .then(function (resData) {
+        if (resData.error && resData.error === 1545012) throw { error: "Cannot change chat title: Not member of chat." };
+        if (resData.error && resData.error === 1545003) throw { error: "Cannot set title of single-user chat." };
+        if (resData.error) throw resData;
         return callback();
       })
-      .catch(function(err) {
+      .catch(function (err) {
         log.error("setTitle", err);
         return callback(err);
       });
-
     return returnPromise;
   };
+  function setTitleMqtt(newTitle, threadID, callback) {
+    if (!ctx.mqttClient) {
+      throw new Error("Not connected to MQTT");
+    }
+    var resolveFunc = function () { };
+    var rejectFunc = function () { };
+    var returnPromise = new Promise(function (resolve, reject) {
+      resolveFunc = resolve;
+      rejectFunc = reject;
+    });
+    if (!callback) {
+      callback = function (err, data) {
+        if (err) return rejectFunc(err);
+        resolveFunc(data);
+        data
+      };
+    }
+    let count_req = 0
+    var form = JSON.stringify({
+      "app_id": "2220391788200892",
+      "payload": JSON.stringify({
+        epoch_id: generateOfflineThreadingID(),
+        tasks: [
+          {
+            failure_count: null,
+            label: '32',
+            payload: JSON.stringify({
+              "thread_key": threadID,
+              "thread_name": newTitle,
+              "sync_group": 1
+            }),
+            queue_name: threadID,
+            task_id: Math.random() * 1001 << 0
+          }
+        ],
+        version_id: '8798795233522156'
+      }),
+      "request_id": ++count_req,
+      "type": 3
+    });
+    mqttClient.publish('/ls_req', form);
+    return returnPromise;
+  };
+  return function setTitle(newTitle, threadID, callback) {
+    if (ctx.mqttClient) {
+      try {
+        setTitleMqtt(newTitle, threadID, callback);
+      } catch (e) {
+        setTitleNoMqtt(newTitle, threadID, callback);
+      }
+    } else {
+      setTitleNoMqtt(newTitle, threadID, callback);
+    }
+  };
 };

package/src/api/messaging/shareContact.js

@@ -1,8 +1,6 @@
 "use strict";
 
-const utils = require("../../utils");
-var log = require("npmlog");
-
+const { generateOfflineThreadingID } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function shareContact(text, senderID, threadID, callback) {
     if (!text) {
@@ -39,7 +37,7 @@ module.exports = function(defaultFuncs, api, ctx) {
             failure_count: null
           }
         ],
-        epoch_id: utils.generateOfflineThreadingID(),
+        epoch_id: generateOfflineThreadingID(),
         version_id: "7214102258676893"
       }),
       request_id: ++count_req,

package/src/api/messaging/threadColors.js

@@ -33,9 +33,6 @@ module.exports = function(_defaultFuncs, _api, _ctx) {
     MediumSlateBlue: "234137870477637", //BrightPurple
     DeepSkyBlue: "2442142322678320", //AquaBlue
     BrilliantRose: "169463077092846", //HotPink
-    //i've tried my best, everything else can't be mapped. (or is it?) -UIRI 2020
-    //#endregion
-
     DefaultBlue: "196241301102133",
     HotPink: "169463077092846",
     AquaBlue: "2442142322678320",

package/src/api/messaging/unsendMessage.js

@@ -1,44 +1,81 @@
 "use strict";
-const utils = require("../../utils");
-const log = require("npmlog");
 
-module.exports = function(defaultFuncs, api, ctx) {
-  return function unsendMessage(messageID, callback) {
-    let resolveFunc = function() {};
-    let rejectFunc = function() {};
-    const returnPromise = new Promise(function(resolve, reject) {
-      resolveFunc = resolve;
-      rejectFunc = reject;
-    });
+const { generateOfflineThreadingID } = require("../../utils/format.js");
+const log = require("npmlog");
 
-    if (!callback) {
-      callback = function(err, friendList) {
-        if (err) {
-          return rejectFunc(err);
-        }
-        resolveFunc(friendList);
+module.exports = function (defaultFuncs, api, ctx) {
+  return function unsendMessage(messageID, threadID, callback) {
+    return new Promise((resolve, reject) => {
+      if (!ctx.mqttClient) {
+        const err = new Error("Not connected to MQTT");
+        callback?.(err);
+        return reject(err);
+      }
+      const reqID = ++ctx.wsReqNumber;
+      const taskID = ++ctx.wsTaskNumber;
+      const taskPayload = {
+        message_id: messageID,
+        thread_key: threadID,
+        sync_group: 1,
       };
-    }
-
-    const form = {
-      message_id: messageID
-    };
-
-    defaultFuncs
-      .post("https://www.facebook.com/messaging/unsend_message/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
-        if (resData.error) {
-          throw resData;
+      const task = {
+        failure_count: null,
+        label: "33",
+        payload: JSON.stringify(taskPayload),
+        queue_name: "unsend_message",
+        task_id: taskID,
+      };
+      const content = {
+        app_id: "2220391788200892",
+        payload: JSON.stringify({
+          tasks: [task],
+          epoch_id: parseInt(generateOfflineThreadingID()),
+          version_id: "25393437286970779",
+        }),
+        request_id: reqID,
+        type: 3,
+      };
+      try {
+        ctx.mqttClient.publish("/ls_req", JSON.stringify(content), {
+          qos: 1,
+          retain: false
+        });
+      } catch (err) {
+        log.error("unsendMessage (MQTT publish failed)", err);
+        callback?.(err);
+        return reject(err);
+      }
+      const handleRes = (topic, message) => {
+        if (topic !== "/ls_resp") return;
+        let jsonMsg;
+        try {
+          jsonMsg = JSON.parse(message.toString());
+          jsonMsg.payload = JSON.parse(jsonMsg.payload);
+        } catch (err) {
+          return;
         }
-
-        return callback();
-      })
-      .catch(function(err) {
-        log.error("unsendMessage", err);
-        return callback(err);
-      });
-
-    return returnPromise;
+        if (jsonMsg.request_id !== reqID) return;
+        ctx.mqttClient.removeListener("message", handleRes);
+        try {
+          const msgID = jsonMsg.payload.step?.[1]?.[2]?.[2]?.[1]?.[2];
+          const msgReplace = jsonMsg.payload.step?.[1]?.[2]?.[2]?.[1]?.[4];
+          if (msgID && msgReplace) {
+            const bodies = {
+              body: msgReplace,
+              messageID: msgID
+            };
+            callback?.(null, bodies);
+            return resolve(bodies);
+          } else {
+            callback?.(null, { success: true });
+            return resolve({ success: true });
+          }
+        } catch (err) {
+          callback?.(null, { success: true });
+          return resolve({ success: true });
+        }
+      };
+      ctx.mqttClient.on("message", handleRes);
+    });
   };
 };