fca-smart-shankar 12.0.0 → 13.0.0

package/src/getThreadListDeprecated.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 
 module.exports = function(defaultFuncs, api, ctx) {
   return function getThreadList(start, end, type, callback) {
@@ -61,14 +61,14 @@ module.exports = function(defaultFuncs, api, ctx) {
         if (resData.error) {
           throw resData;
         }
-        console.log("getThreadList", JSON.stringify(resData.payload.threads));
+        log.verbose("getThreadList", JSON.stringify(resData.payload.threads));
         return callback(
           null,
           (resData.payload.threads || []).map(utils.formatThread)
         );
       })
       .catch(function(err) {
-        console.error("getThreadList", err);
+        log.error("getThreadList", err);
         return callback(err);
       });
   };

package/src/getThreadPictures.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function getThreadPictures(threadID, offset, limit, callback) {
@@ -71,7 +71,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData);
       })
       .catch(function (err) {
-        console.error("Error in getThreadPictures", err);
+        log.error("Error in getThreadPictures", err);
         callback(err);
       });
     return returnPromise;

package/src/getUID.js

@@ -33,7 +33,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         if (data.error) throw new Error(data.error);
         return data.id || "Not found";
       } catch (e) {
-        console.error('getUID', "Error: " + e.message);
+        log.error('getUID', "Error: " + e.message);
         throw new Error(e.message);
       }
     }
@@ -72,7 +72,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         if (typeof data.error === 'string') throw new Error(data.error);
         return data.data.id || "Not found";
       } catch (e) {
-        console.error('getUID', "Error: " + e.message);
+        log.error('getUID', "Error: " + e.message);
         throw new Error(e.message);
       }
     }
@@ -85,7 +85,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         if (!isNaN(uid)) return uid;
         throw new Error("Unable to retrieve UID");
       } catch (e) {
-        console.error('getUID', "Error: " + e.message);
+        log.error('getUID', "Error: " + e.message);
         throw new Error(e.message);
       }
     }
@@ -111,7 +111,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         throw new Error('Invalid link. The link should be a Facebook link.');
       }
     } catch (e) {
-      console.error('getUID', "Error: " + e.message);
+      log.error('getUID', "Error: " + e.message);
       return callback(null, e);
     }
     return returnPromise;

package/src/getUserID.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 function formatData(data) {
   return {
@@ -37,7 +37,7 @@ module.exports = function (defaultFuncs, api, ctx) {
 
     const form = {
       value: name.toLowerCase(),
-      viewer: ctx.userID,
+      viewer: ctx.i_userID || ctx.userID,
       rsp: "search",
       context: "search",
       path: "/home.php",
@@ -57,7 +57,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, data.map(formatData));
       })
       .catch(function (err) {
-        console.error("getUserID", err);
+        log.error("getUserID", err);
         return callback(err);
       });
 

package/src/getUserInfo.js

@@ -1,7 +1,8 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
+const randomUserAgent = require("random-useragent");
 
 function formatData(data) {
   const retObj = {};
@@ -21,7 +22,7 @@ function formatData(data) {
         isFriend: innerObj.is_friend,
         isBirthday: !!innerObj.is_birthday,
         searchTokens: innerObj.searchTokens,
-        alternateName: innerObj.alternateName
+        alternateName: innerObj.alternateName,
       };
     }
   }
@@ -31,12 +32,13 @@ function formatData(data) {
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function getUserInfo(id, callback) {
-    let resolveFunc = () => {}
-    let rejectFunc = () => {};
+    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) {
@@ -45,28 +47,60 @@ module.exports = function (defaultFuncs, api, ctx) {
         resolveFunc(friendList);
       };
     }
+
     if (utils.getType(id) !== "Array") {
       id = [id];
     }
+
     const form = {};
-    id.map((v, i) => {
+    id.map(function (v, i) {
       form["ids[" + i + "]"] = v;
     });
-    defaultFuncs
-      .post("https://www.facebook.com/chat/user_info/", ctx.jar, form)
-      .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function (resData) {
-        if (resData.error) {
-          throw resData;
+
+    const performRequest = (retries = 3) => {
+      try {
+        const userAgent = randomUserAgent.getRandom();  // Get a random user-agent
+
+        if (!userAgent) {
+          throw new Error("Failed to generate a valid User-Agent.");
         }
-        return callback(null, formatData(resData.payload.profiles));
-      })
-      .catch(function (err) {
-        console.error("getUserInfo", err);
-        return callback(err);
-      });
+
+        defaultFuncs
+          .post("https://www.facebook.com/chat/user_info/", ctx.jar, form, {
+            headers: {
+              "User-Agent": userAgent,  // Ensure User-Agent is valid
+            }
+          })
+          .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
+          .then(function (resData) {
+            if (resData.error) {
+              throw resData;
+            }
+            return callback(null, formatData(resData.payload.profiles));
+          })
+          .catch(function (err) {
+            log.error("getUserInfo", err);
+            if (retries > 0) {
+              log.info("Retrying Retrieve User Info... Remaining attempts: " + retries);
+              performRequest(retries - 1);
+            } else {
+              return callback(err);
+            }
+          });
+      } catch (err) {
+        log.error("getUserInfo", err);
+        if (retries > 0) {
+          log.info("Retrying Retrieve User Info... Remaining attempts: " + retries);
+          performRequest(retries - 1);
+        } else {
+          return callback(err);
+        }
+      }
+    };
+
+    performRequest();
 
     return returnPromise;
   };
 };
- 
+

package/src/handleFriendRequest.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function handleFriendRequest(userID, accept, callback) {
@@ -28,7 +28,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     }
 
     const form = {
-      viewer_id: ctx.userID,
+      viewer_id: ctx.i_userID || ctx.userID,
       "frefs[0]": "jwl",
       floc: "friend_center_requests",
       ref: "/reqs.php",
@@ -39,16 +39,16 @@ module.exports = function (defaultFuncs, api, ctx) {
       .post("https://www.facebook.com/requests/friends/ajax/", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
       .then(function (resData) {
-        if (resData.err) {
+        if (resData.payload.err) {
           throw {
-            err: resData.err
+            err: resData.payload.err,
           };
         }
 
         return callback();
       })
       .catch(function (err) {
-        console.error("handleFriendRequest", err);
+        log.error("handleFriendRequest", err);
         return callback(err);
       });
 

package/src/handleMessageRequest.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function handleMessageRequest(threadID, accept, callback) {
@@ -56,7 +56,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("handleMessageRequest", err);
+        log.error("handleMessageRequest", err);
         return callback(err);
       });
 

package/src/httpGet.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function httpGet(url, form, customHeader, callback, notAPI) {
@@ -45,7 +45,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpGet", err);
+          log.error("httpGet", err);
           return callback(err);
         });
     } else {
@@ -55,7 +55,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpGet", err);
+          log.error("httpGet", err);
           return callback(err);
         });
     }

package/src/httpPost.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function httpPost(url, form, customHeader, callback, notAPI) {
@@ -45,7 +45,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpPost", err);
+          log.error("httpPost", err);
           return callback(err);
         });
     } else {
@@ -55,7 +55,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpPost", err);
+          log.error("httpPost", err);
           return callback(err);
         });
     }

package/src/httpPostFormData.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 
 module.exports = function (defaultFuncs, api, ctx) {
   return function httpPostFormData(url, form, customHeader, callback, notAPI) {
@@ -50,7 +50,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpPostFormData", err);
+          log.error("httpPostFormData", err);
           return callback(err);
         });
     } else {
@@ -60,7 +60,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           callback(null, resData.body.toString());
         })
         .catch(function (err) {
-          console.error("httpPostFormData", err);
+          log.error("httpPostFormData", err);
           return callback(err);
         });
     }