npm - fca-smart-shankar - Versions diffs - 12.0.0 → 13.0.0 - Mend

fca-smart-shankar 12.0.0 → 13.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (285) hide show

package/src/listenNotification.js CHANGED Viewed

@@ -51,7 +51,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           return format(res.data.viewer, globalCallback);
         })
         .catch(function (err) {
-          console.error('listenNotification', err);
+          log.error('listenNotification', err);
           clearInterval(interval);
           interval = void 0;
           return globalCallback(err);

package/src/logout.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function logout(callback) {
@@ -62,11 +62,11 @@ module.exports = function (defaultFuncs, api, ctx) {
       })
       .then(function () {
         ctx.loggedIn = false;
-        console.log("logout", "Logged out successfully.");
+        log.info("logout", "Logged out successfully.");
         callback();
       })
       .catch(function (err) {
-        console.error("logout", err);
+        log.error("logout", err);
         return callback(err);
       });

package/src/markAsDelivered.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function markAsDelivered(threadID, messageID, callback) {
@@ -46,7 +46,10 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("markAsDelivered", err);
+        log.error("markAsDelivered", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+          ctx.loggedIn = false;
+        }
         return callback(err);
       });

package/src/markAsRead.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return async function markAsRead(threadID, read, callback) {
@@ -48,7 +48,10 @@ module.exports = function (defaultFuncs, api, ctx) {
       if (resData.error) {
         const err = resData.error;
-        console.error("markAsRead", err);
+        log.error("markAsRead", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+          ctx.loggedIn = false;
+        }
         callback(err);
         return err;
       }

package/src/markAsReadAll.js CHANGED Viewed

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

package/src/markAsSeen.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function markAsRead(seen_timestamp, callback) {
@@ -49,7 +49,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("markAsSeen", err);
+        log.error("markAsSeen", err);
         if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
           ctx.loggedIn = false;
         }

package/src/muteThread.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   // muteSecond: -1=permanent mute, 0=unmute, 60=one minute, 3600=one hour, etc.
@@ -43,7 +43,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("muteThread", err);
+        log.error("muteThread", err);
         return callback(err);
       });

package/src/refreshFb_dtsg.js CHANGED Viewed

@@ -1,10 +1,10 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
- /**
+  /**
    * Refreshes the fb_dtsg and jazoest values.
    * @param {Function} callback
    * @returns {Promise}
@@ -71,7 +71,7 @@ module.exports = function (defaultFuncs, api, ctx) {
           });
         })
         .catch(function (err) {
-          console.error("refreshFb_dtsg", err);
+          log.error("refreshFb_dtsg", err);
           return callback(err);
         });
     } else {

package/src/removeUserFromGroup.js CHANGED Viewed

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

package/src/resolvePhotoUrl.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function resolvePhotoUrl(photoID, callback) {
@@ -36,7 +36,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback(null, photoUrl);
       })
       .catch((err) => {
-        console.error("resolvePhotoUrl", err);
+        log.error("resolvePhotoUrl", err);
         return callback(err);
       });

package/src/searchStickers.js CHANGED Viewed

@@ -44,7 +44,7 @@ module.exports = function (http, api, ctx) {
         return cb(null, res.data.sticker_search.sticker_results.edges.map(formatData));
       })
       .catch(function (err) {
-        console.error('searchStickers', err);
+        log.error('searchStickers', err);
         return cb(err);
       });
     return returnPromise;

package/src/sendMessage.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 var bluebird = require("bluebird");
 var allowedProperties = {
@@ -63,7 +63,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData);
       })
       .catch(function (err) {
-        console.error("uploadAttachment", err);
+        log.error("uploadAttachment", err);
         return callback(err);
       });
   }
@@ -94,7 +94,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData.payload.share_data.share_params);
       })
       .catch(function (err) {
-        console.error("getUrl", err);
+        log.error("getUrl", err);
         return callback(err);
       });
   }
@@ -111,7 +111,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       }
       form["specific_to_list[" + threadID.length + "]"] = "fbid:" + ctx.userID;
       form["client_thread_id"] = "root:" + messageAndOTID;
-      console.log("sendMessage", "Sending message to multiple users: " + threadID);
+      log.info("sendMessage", "Sending message to multiple users: " + threadID);
     } else {
       // This means that threadID is the id of a user, and the chat
       // is a single person chat
@@ -146,7 +146,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         if (resData.error) {
           if (resData.error === 1545012) {
-            console.warn(
+            log.warn(
               "sendMessage",
               "Got error 1545012. This might mean that you're not part of the conversation " +
               threadID
@@ -168,7 +168,10 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback(null, messageInfo);
       })
       .catch(function (err) {
-        console.error("sendMessage", err);
+        log.error("sendMessage", err);
+        if (utils.getType(err) == "Object" && err.error === "Not logged in.") {
+          ctx.loggedIn = false;
+        }
         return callback(err);
       });
   }
@@ -290,14 +293,14 @@ module.exports = function (defaultFuncs, api, ctx) {
         const offset = msg.body.indexOf(tag, mention.fromIndex || 0);
         if (offset < 0) {
-          console.warn(
+          log.warn(
             "handleMention",
             'Mention for "' + tag + '" not found in message string.'
           );
         }
         if (mention.id == null) {
-          console.warn("handleMention", "Mention id should be non-null.");
+          log.warn("handleMention", "Mention id should be non-null.");
         }
         const id = mention.id || 0;

package/src/sendMessageMqtt.js CHANGED Viewed

@@ -1,5 +1,5 @@
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 var bluebird = require("bluebird");
 module.exports = function (defaultFuncs, api, ctx) {
@@ -51,7 +51,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData);
       })
       .catch(function (err) {
-        console.error("uploadAttachment", err);
+        log.error("uploadAttachment", err);
         return callback(err);
       });
   }
@@ -146,14 +146,14 @@ module.exports = function (defaultFuncs, api, ctx) {
         const offset = msg.body.indexOf(tag, mention.fromIndex || 0);
         if (offset < 0) {
-          console.warn(
+          log.warn(
             "handleMention",
             'Mention for "' + tag + '" not found in message string.',
           );
         }
         if (mention.id == null) {
-          console.warn("handleMention", "Mention id should be non-null.");
+          log.warn("handleMention", "Mention id should be non-null.");
         }
         const id = mention.id || 0;

package/src/sendTypingIndicator.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   function makeTypingIndicator(typ, threadID, callback, isGroup) {
@@ -29,7 +29,10 @@ module.exports = function (defaultFuncs, api, ctx) {
           return callback();
         })
         .catch(function (err) {
-          console.error("sendTypingIndicator", err);
+          log.error("sendTypingIndicator", err);
+          if (utils.getType(err) == "Object" && err.error === "Not logged in") {
+            ctx.loggedIn = false;
+          }
           return callback(err);
         });
     } else {
@@ -58,7 +61,13 @@ module.exports = function (defaultFuncs, api, ctx) {
             return callback();
           })
           .catch(function (err) {
-            console.error("sendTypingIndicator", err);
+            log.error("sendTypingIndicator", err);
+            if (
+              utils.getType(err) == "Object" &&
+              err.error === "Not logged in."
+            ) {
+              ctx.loggedIn = false;
+            }
             return callback(err);
           });
       });
@@ -71,7 +80,7 @@ module.exports = function (defaultFuncs, api, ctx) {
       utils.getType(callback) !== "AsyncFunction"
     ) {
       if (callback) {
-        console.warn(
+        log.warn(
           "sendTypingIndicator",
           "callback is not a function - ignoring.",
         );
@@ -87,7 +96,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         utils.getType(cb) !== "AsyncFunction"
       ) {
         if (cb) {
-          console.warn(
+          log.warn(
             "sendTypingIndicator",
             "callback is not a function - ignoring.",
           );

package/src/sendTypingIndicatorV2.js CHANGED Viewed

@@ -3,7 +3,7 @@
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
 	return async function sendTypingIndicatorV2(sendTyping,threadID, callback) {

package/src/setMessageReaction.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function setMessageReaction(
@@ -82,7 +82,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     const variables = {
       data: {
         client_mutation_id: ctx.clientMutationId++,
-        actor_id: ctx.userID,
+        actor_id: ctx.i_userID || ctx.userID,
         action: reaction == "" ? "REMOVE_REACTION" : "ADD_REACTION",
         message_id: messageID,
         reaction: reaction,
@@ -113,7 +113,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null);
       })
       .catch(function (err) {
-        console.error("setReaction", err);
+        log.error("setReaction", err);
         return callback(err);
       });

package/src/setPostReaction.js CHANGED Viewed

@@ -7,7 +7,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 function formatData(resData) {
   return {
@@ -73,13 +73,13 @@ module.exports = function (defaultFuncs, api, ctx) {
     }
     const form = {
-      av: ctx.userID,
+      av: ctx.i_userID || ctx.userID,
       fb_api_caller_class: "RelayModern",
       fb_api_req_friendly_name: "CometUFIFeedbackReactMutation",
       doc_id: "4769042373179384",
       variables: JSON.stringify({
         input: {
-          actor_id: ctx.userID,
+          actor_id: ctx.i_userID || ctx.userID,
           feedback_id: new Buffer("feedback:" + postID).toString("base64"),
           feedback_reaction: type,
           feedback_source: "OBJECT",
@@ -103,7 +103,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback(null, formatData(resData.data));
       })
       .catch(function (err) {
-        console.error("setPostReaction", err);
+        log.error("setPostReaction", err);
         return callback(err);
       });

package/src/setProfileGuard.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
-const utils = require("ws3-fca/utils");
+const utils = require("../utils");
 // @NethWs3Dev
 module.exports = (defaultFuncs, api, ctx) => {
@@ -10,7 +10,7 @@ module.exports = (defaultFuncs, api, ctx) => {
         error: "Please pass a boolean as a second argument.",
       };
     }
-    const uid = ctx.userID;
+    const uid = ctx.userID || ctx.i_userID;
     const form = {
       av: uid,
       variables: JSON.stringify({
@@ -29,7 +29,7 @@ module.exports = (defaultFuncs, api, ctx) => {
     return defaultFuncs
       .post("https://www.facebook.com/api/graphql", ctx.jar, form)
       .then(utils.parseAndCheckLogin(ctx, defaultFuncs))
-      .then(function(resData) {
+      .then((resData) => {
         if (resData.err) {
           throw {
             err: resData.err

package/src/setStoryReaction.js CHANGED Viewed

@@ -53,7 +53,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         return cb();
       })
       .catch(function(err) {
-        console.error('setPostReaction', err);
+        log.error('setPostReaction', err);
         return cb(err);
       });

package/src/setTitle.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   return function setTitle(newTitle, threadID, callback) {
@@ -33,7 +33,7 @@ module.exports = function (defaultFuncs, api, ctx) {
     const form = {
       client: "mercury",
       action_type: "ma-type:log-message",
-      author: "fbid:" + (ctx.userID),
+      author: "fbid:" + (ctx.i_userID || ctx.userID),
       author_email: "",
       coordinates: "",
       timestamp: Date.now(),
@@ -81,7 +81,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function (err) {
-        console.error("setTitle", err);
+        log.error("setTitle", err);
         return callback(err);
       });

package/src/shareContact.js CHANGED Viewed

@@ -58,7 +58,7 @@ module.exports = function(defaultFuncs, api, ctx) {
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {

package/src/shareLink.js CHANGED Viewed

@@ -2,7 +2,7 @@
 "use strict";
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
 	return async function shareLink(text, url, threadID, callback) {

package/src/stopListenMqtt.js CHANGED Viewed

@@ -5,18 +5,21 @@
 */
 // @NethWs3Dev
+var log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx){
   return function stopListenMqtt() {
     if (!ctx.mqttClient) {
       throw new Error("Not connected to MQTT");
     }
-    console.log("stopListenMqtt", "Stopping...");
+    log.warn("stopListenMqtt", "Stopping...");
     ctx.mqttClient.unsubscribe("/webrtc");
     ctx.mqttClient.unsubscribe("/rtc_multi");
     ctx.mqttClient.unsubscribe("/onevc");
     ctx.mqttClient.publish("/browser_close", "{}");
     ctx.mqttClient.end(false, (...data) => {
-      console.log("stopListenMqtt", "Stopped");
+      log.info("stopListenMqtt", "Stopped");
       ctx.mqttClient = null;
     });
   }

package/src/unfriend.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 var utils = require("../utils");
-// @NethWs3Dev
+var log = require("npmlog");
 module.exports = function(defaultFuncs, api, ctx) {
   return function unFriend(userID, callback) {
@@ -43,7 +43,7 @@ module.exports = function(defaultFuncs, api, ctx) {
         return callback();
       })
       .catch(function(err) {
-        console.error("unfriend", err);
+        log.error("unfriend", err);
         return callback(err);
       });

package/src/unsendMessage.js CHANGED Viewed

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

package/src/uploadAttachment.js CHANGED Viewed

@@ -1,5 +1,5 @@
 const utils = require("../utils");
-// @NethWs3Dev
+const log = require("npmlog");
 module.exports = function (defaultFuncs, api, ctx) {
   function upload(attachments, callback) {
@@ -49,7 +49,7 @@ module.exports = function (defaultFuncs, api, ctx) {
         callback(null, resData);
       })
       .catch(function (err) {
-        console.error("uploadAttachment", err);
+        log.error("uploadAttachment", err);
         return callback(err);
       });
   }