node-red-viseo-helper - npm Package Compare versions

Comparing version 0.2.0-alpha.7 to 0.2.0-alpha.8

CODE_OF_CONDUCT.md

@@ -0,0 +0,0 @@ # Contributor Covenant Code of Conduct

CONTRIBUTING.md

@@ -0,0 +0,0 @@ # Contributing to the Project

index.js

@@ -132,2 +132,3 @@ 'use strict';
 const getContextValue = exports.getContextValue = (RED, node, data, str, type) => {
+    if (!str) return str;
     try {
@@ -238,40 +239,48 @@ let value = RED.util.evaluateNodeProperty(str, type, node, data, null);
 let activities = {};
+let oldKeys = [];
+let actKey = "";
+
 exports.trackActivities = async function trackActivities(node) {
-    function unauth() {
+
+    function nextErr(err) {
         node.status({fill:"red", shape:"ring", text: 'Missing VISEO Bot Maker key'});
-        node.error("Missing VISEO Bot Maker key - Read the documentation.")
+        node.error(err)
         return false;
     }
 
-    let conf = CONFIG  || global.CONFIG;
-    let key = conf.key || '';
+    if (!actKey) {
+        let keyField = "VISEO_BOT_MAKER_KEY";
+        let conf = CONFIG || global.CONFIG;
+        let key = conf[keyField] || node.context().global.get(keyField);
+        
+        if (!key) {
+            return nextErr("Missing VISEO Bot Maker key - Read the documentation.");
+        }
+        if ( key.length !== 40 || oldKeys.indexOf(key) !== -1) {
+            return nextErr("Invalid VISEO Bot Maker key - Read the documentation.");
+        }
+
+        actKey = key;
+        node.status({});
+    }
+
     let time = Date.now();
-    if (!key) return unauth();
 
-    // First pass : set start time
-    if (!activities.info) { 
-        activities = { 
-            info : { 
-                start : time,
-                key : key
-            }
-        };
+    if (!activities.info) {
+        // First pass : set start time
+        activities = { info : { start : time, key : actKey }};
     }
-    else if (time - activities.info.start > 1000 ){  // 24h :  24 * 3600 * 1000 = 86400000
+    else if (time - activities.info.start > 86400000){
+        // 24h :  24 * 3600 * 1000 = 86400000
         try {
-            node.warn(activities)
             await sendActivities(activities);
+            activities = { info : { start : time, key : actKey }};
         } catch(err) {
-            if (err.statusCode === 401) return unauth();
+            activities = { info : { start : time, key : actKey }};
+            if (err.statusCode === 401) return nextErr("Invalid VISEO Bot Maker key - Read the documentation.");
             return true;
         }
-        activities = { 
-            info : { 
-                start : time,
-                key : key
-            }
-        };
     } 
     else {
-        // set the last time
+        // Set last time
         activities.info.end = time;
@@ -294,3 +303,2 @@ }
     activities[node.type].end = time;
-    activities.info.end = time;
 
@@ -313,3 +321,2 @@ return true;
 
-    // send data
     let request = {
@@ -323,4 +330,3 @@ url: "https://nodedatafunction.azurewebsites.net/api/sendActivities?code=rriqcWx/cCsUQ0oxcVqTTaxsXWj5gf2AOCqhSayw8vaGaQKf6SgaQw==",
 
-    console.log(request)
     return rp(request);
 }

lib/config.js

@@ -0,0 +0,0 @@ const extend = require('extend');

package.json

 {
     "name"          : "node-red-viseo-helper",
-    "version"       : "0.2.0-alpha.7",
+    "version"       : "0.2.0-alpha.8",
     "description"   : "Utility libarary for Node-RED",
@@ -5,0 +5,0 @@ "dependencies"  : {

README.md

@@ -0,0 +0,0 @@ # Node-RED

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

27245

increased by3.93%

Lines of code

286

increased by0.35%

No dependency changes