@dongdev/fca-unofficial 2.0.7 → 2.0.10

package/src/api/action/changeAvatar.js

@@ -1,16 +1,17 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { isReadableStream } = require("../../utils/constants");
+const { parseAndCheckLogin } = require("../../utils/client");
+const { formatID, getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   function handleUpload(image, callback) {
     const uploads = [];
 
     const form = {
-      profile_id: ctx.i_userID || ctx.userID,
+      profile_id: ctx.userID,
       photo_source: 57,
-      av: ctx.i_userID || ctx.userID,
+      av: ctx.userID,
       file: image
     };
 
@@ -22,7 +23,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;
@@ -55,7 +56,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       rejectFunc = reject;
     });
 
-    if (!timestamp && utils.getType(caption) === "Number") {
+    if (!timestamp && getType(caption) === "Number") {
       timestamp = caption;
       caption = "";
     }
@@ -63,8 +64,8 @@ module.exports = function(defaultFuncs, api, ctx) {
     if (
       !timestamp &&
       !callback &&
-      (utils.getType(caption) == "Function" ||
-        utils.getType(caption) == "AsyncFunction")
+      (getType(caption) == "Function" ||
+        getType(caption) == "AsyncFunction")
     ) {
       callback = caption;
       caption = "";
@@ -79,7 +80,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         resolveFunc(data);
       };
 
-    if (!utils.isReadableStream(image))
+    if (!isReadableStream(image))
       return callback("Image is not a readable stream");
 
     handleUpload(image, function(err, payload) {
@@ -118,7 +119,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
       defaultFuncs
         .post("https://www.facebook.com/api/graphql/", ctx.jar, form)
-        .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+        .then(parseAndCheckLogin(ctx, defaultFuncs))
         .then(function(resData) {
           if (resData.errors) {
             throw resData;

package/src/api/action/changeBio.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function changeBio(bio, publish, callback) {
     let resolveFunc = function() {};
@@ -14,8 +14,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (!callback) {
       if (
-        utils.getType(publish) == "Function" ||
-        utils.getType(publish) == "AsyncFunction"
+        getType(publish) == "Function" ||
+        getType(publish) == "AsyncFunction"
       ) {
         callback = publish;
       } else {
@@ -28,11 +28,11 @@ module.exports = function(defaultFuncs, api, ctx) {
       }
     }
 
-    if (utils.getType(publish) != "Boolean") {
+    if (getType(publish) != "Boolean") {
       publish = false;
     }
 
-    if (utils.getType(bio) != "String") {
+    if (getType(bio) != "String") {
       bio = "";
       publish = false;
     }
@@ -40,7 +40,6 @@ module.exports = function(defaultFuncs, api, ctx) {
     const form = {
       fb_api_caller_class: "RelayModern",
       fb_api_req_friendly_name: "ProfileCometSetBioMutation",
-      // This doc_is is valid as of May 23, 2020
       doc_id: "2725043627607610",
       variables: JSON.stringify({
         input: {
@@ -58,7 +57,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     defaultFuncs
       .post("https://www.facebook.com/api/graphql/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.errors) {
           throw resData;

package/src/api/action/getCurrentUserID.js

@@ -2,6 +2,6 @@
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function getCurrentUserID() {
-    return ctx.i_userID || ctx.userID;
+    return ctx.userID;
   };
 };

package/src/api/action/handleFriendRequest.js

@@ -1,11 +1,11 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function handleFriendRequest(userID, accept, callback) {
-    if (utils.getType(accept) !== "Boolean") {
+    if (getType(accept) !== "Boolean") {
       throw {
         error: "Please pass a boolean as a second argument."
       };
@@ -28,7 +28,7 @@ module.exports = function(defaultFuncs, api, ctx) {
     }
 
     const form = {
-      viewer_id: ctx.i_userID || ctx.userID,
+      viewer_id: ctx.userID,
       "frefs[0]": "jwl",
       floc: "friend_center_requests",
       ref: "/reqs.php",
@@ -37,7 +37,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     defaultFuncs
       .post("https://www.facebook.com/requests/friends/ajax/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.payload.err) {
           throw {

package/src/api/action/logout.js

@@ -1,8 +1,9 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getFrom } = require("../../utils/constants");
+const { saveCookies } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function logout(callback) {
     let resolveFunc = function() {};
@@ -31,7 +32,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         ctx.jar,
         form
       )
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         const elem = resData.jsmods.instances[0][2][0].filter(function(v) {
           return v.value === "logout";
@@ -42,14 +43,14 @@ module.exports = function(defaultFuncs, api, ctx) {
         })[0][1].__html;
 
         const form = {
-          fb_dtsg: utils.getFrom(html, '"fb_dtsg" value="', '"'),
-          ref: utils.getFrom(html, '"ref" value="', '"'),
-          h: utils.getFrom(html, '"h" value="', '"')
+          fb_dtsg: getFrom(html, '"fb_dtsg" value="', '"'),
+          ref: getFrom(html, '"ref" value="', '"'),
+          h: getFrom(html, '"h" value="', '"')
         };
 
         return defaultFuncs
           .post("https://www.facebook.com/logout.php", ctx.jar, form)
-          .then(utils.saveCookies(ctx.jar));
+          .then(saveCookies(ctx.jar));
       })
       .then(function(res) {
         if (!res.headers) {
@@ -58,7 +59,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
         return defaultFuncs
           .get(res.headers.location, ctx.jar)
-          .then(utils.saveCookies(ctx.jar));
+          .then(saveCookies(ctx.jar));
       })
       .then(function() {
         ctx.loggedIn = false;

package/src/api/action/refreshFb_dtsg.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { getFrom } = require("../../utils/constants");
+const { get } = require("../../utils/request")
 module.exports = function(defaultFuncs, api, ctx) {
   return function refreshFb_dtsg(obj, callback) {
     let resolveFunc, rejectFunc;
@@ -11,15 +11,15 @@ module.exports = function(defaultFuncs, api, ctx) {
       rejectFunc = reject;
     });
     if (
-      utils.getType(obj) === "Function" ||
-      utils.getType(obj) === "AsyncFunction"
+      getType(obj) === "Function" ||
+      getType(obj) === "AsyncFunction"
     ) {
       callback = obj;
       obj = {};
     }
     if (!obj) obj = {};
-    if (utils.getType(obj) !== "Object") {
-      throw new utils.CustomError(
+    if (getType(obj) !== "Object") {
+      throw Error(
         "The first parameter must be an object or a callback function"
       );
     }
@@ -27,19 +27,24 @@ module.exports = function(defaultFuncs, api, ctx) {
       callback = (err, data) => (err ? rejectFunc(err) : resolveFunc(data));
     }
     if (Object.keys(obj).length === 0) {
-      utils
-        .get("https://www.facebook.com/", ctx.jar, null, ctx.globalOptions, {
+      get(
+        "https://www.facebook.com/",
+        ctx.jar,
+        null,
+        ctx.globalOptions,
+        {
           noRef: true
-        })
+        }
+      )
         .then(resData => {
-          const fb_dtsg = utils.getFrom(
+          const fb_dtsg = getFrom(
             resData.body,
             '["DTSGInitData",[],{"token":"',
             '","'
           );
-          const jazoest = utils.getFrom(resData.body, "jazoest=", '",');
+          const jazoest = getFrom(resData.body, "jazoest=", '",');
           if (!fb_dtsg) {
-            throw new utils.CustomError(
+            throw Error(
               "Could not find fb_dtsg in HTML after requesting Facebook."
             );
           }

package/src/api/action/setPostReaction.js

@@ -1,9 +1,8 @@
-
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
+const { getType } = require("../../utils/format");
 function formatData(resData) {
   return {
     viewer_feedback_reaction_info:
@@ -25,8 +24,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (!callback) {
       if (
-        utils.getType(type) === "Function" ||
-        utils.getType(type) === "AsyncFunction"
+        getType(type) === "Function" ||
+        getType(type) === "AsyncFunction"
       ) {
         callback = type;
         type = 0;
@@ -51,11 +50,11 @@ module.exports = function(defaultFuncs, api, ctx) {
       angry: 8
     };
 
-    if (utils.getType(type) !== "Number" && utils.getType(type) === "String") {
+    if (getType(type) !== "Number" && getType(type) === "String") {
       type = map[type.toLowerCase()];
     }
 
-    if (utils.getType(type) !== "Number" && utils.getType(type) !== "String") {
+    if (getType(type) !== "Number" && getType(type) !== "String") {
       throw {
         error: "setPostReaction: Invalid reaction type"
       };
@@ -68,14 +67,14 @@ module.exports = function(defaultFuncs, api, ctx) {
     }
 
     const form = {
-      av: ctx.i_userID || ctx.userID,
+      av: ctx.userID,
       fb_api_caller_class: "RelayModern",
       fb_api_req_friendly_name: "CometUFIFeedbackReactMutation",
       doc_id: "4769042373179384",
       variables: JSON.stringify({
         input: {
-          actor_id: ctx.i_userID || ctx.userID,
-          feedback_id: new Buffer("feedback:" + postID).toString("base64"),
+          actor_id: ctx.userID,
+          feedback_id: Buffer.from("feedback:" + postID).toString("base64"),
           feedback_reaction: type,
           feedback_source: "OBJECT",
           is_tracking_encrypted: true,
@@ -90,7 +89,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     defaultFuncs
       .post("https://www.facebook.com/api/graphql/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
         if (resData.errors) {
           throw resData;

package/src/api/action/unfriend.js

@@ -1,8 +1,7 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { parseAndCheckLogin } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function unfriend(userID, callback) {
     let resolveFunc = function() {};
@@ -27,7 +26,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       floc: "friends_tab",
       "nctr[_mod]":
         "pagelet_timeline_app_collection_" +
-        (ctx.i_userID || ctx.userID) +
+        ctx.userID +
         ":2356318349:2"
     };
 
@@ -37,7 +36,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;

package/src/api/http/httpGet.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { get } = require("../../utils/request");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function httpGet(url, form, customHeader, callback, notAPI) {
     let resolveFunc = function() {};
@@ -14,16 +14,16 @@ module.exports = function(defaultFuncs, api, ctx) {
     });
 
     if (
-      utils.getType(form) == "Function" ||
-      utils.getType(form) == "AsyncFunction"
+      getType(form) == "Function" ||
+      getType(form) == "AsyncFunction"
     ) {
       callback = form;
       form = {};
     }
 
     if (
-      utils.getType(customHeader) == "Function" ||
-      utils.getType(customHeader) == "AsyncFunction"
+      getType(customHeader) == "Function" ||
+      getType(customHeader) == "AsyncFunction"
     ) {
       callback = customHeader;
       customHeader = {};
@@ -39,8 +39,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       };
 
     if (notAPI) {
-      utils
-        .get(url, ctx.jar, form, ctx.globalOptions, ctx, customHeader)
+      get(url, ctx.jar, form, ctx.globalOptions, ctx, customHeader)
         .then(function(resData) {
           callback(null, resData.data.toString());
         })

package/src/api/http/httpPost.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 const log = require("npmlog");
-
+const { post } = require("../../utils/request");
+const { getType } = require("../../utils/format");
 module.exports = function(defaultFuncs, api, ctx) {
   return function httpPost(url, form, customHeader, callback, notAPI) {
     let resolveFunc = function() {};
@@ -14,16 +14,16 @@ module.exports = function(defaultFuncs, api, ctx) {
     });
 
     if (
-      utils.getType(form) == "Function" ||
-      utils.getType(form) == "AsyncFunction"
+      getType(form) == "Function" ||
+      getType(form) == "AsyncFunction"
     ) {
       callback = form;
       form = {};
     }
 
     if (
-      utils.getType(customHeader) == "Function" ||
-      utils.getType(customHeader) == "AsyncFunction"
+      getType(customHeader) == "Function" ||
+      getType(customHeader) == "AsyncFunction"
     ) {
       callback = customHeader;
       customHeader = {};
@@ -39,8 +39,7 @@ module.exports = function(defaultFuncs, api, ctx) {
       };
 
     if (notAPI) {
-      utils
-        .post(url, ctx.jar, form, ctx.globalOptions, ctx, customHeader)
+      post(url, ctx.jar, form, ctx.globalOptions, ctx, customHeader)
         .then(function(resData) {
           callback(null, resData.data.toString());
         })

package/src/api/http/postFormData.js

@@ -1,8 +1,8 @@
 "use strict";
 
-const utils = require("../../utils");
 var log = require("npmlog");
-
+const { getType } = require("../../utils/format");
+const { parseAndCheckLogin } = require("../../utils/client");
 module.exports = function(defaultFuncs, api, ctx) {
   return function postFormData(url, form, callback) {
     var resolveFunc = function() {};
@@ -15,8 +15,8 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     if (
       !callback &&
-      (utils.getType(form) == "Function" ||
-        utils.getType(form) == "AsyncFunction")
+      (getType(form) == "Function" ||
+        getType(form) == "AsyncFunction")
     ) {
       callback = form;
       form = {};
@@ -33,8 +33,9 @@ module.exports = function(defaultFuncs, api, ctx) {
 
     defaultFuncs
       .postFormData(url, ctx.jar, form, {})
+      .then(parseAndCheckLogin(ctx, defaultFuncs))
       .then(function(resData) {
-        callback(null, resData.data.toString());
+        callback(null, resData);
       })
       .catch(function(err) {
         log.error("postFormData", err);

package/src/api/messaging/addUserToGroup.js

@@ -15,7 +15,6 @@ module.exports = function (defaultFuncs, api, ctx) {
         return reject(err);
       }
       if (getType(userID) !== "Array") userID = [userID];
-
       const reqID = ++ctx.wsReqNumber;
       const taskID = ++ctx.wsTaskNumber;