node-red-contrib-mobius-flow-base 2.5.86-beta.78 → 2.5.86-beta.81

package/dist/nodes/mobius-connection.js

@@ -193,6 +193,42 @@ module.exports = function (RED) {
       });
     };
 
+    /**
+     * Update a given node's node status based on last active time
+     * @param  {Object} mobiusNode - The node whos status is to be updated
+     */
+    node.updateNodeStatus = function (mobiusNode) {
+      node.users[mobiusNode.id] = mobiusNode;
+      const timeSinceLastActive = Date.now() - node.users[mobiusNode.id].lastActiveTime;
+      let statusText = '';
+      let statusColour = 'green';
+      if (timeSinceLastActive < 15 * 60000) {
+        statusText = 'Active less than 15 minutes ago';
+      }
+      if (timeSinceLastActive >= 15 * 60000 && timeSinceLastActive < 3 * 60 * 60000) {
+        statusText = 'Active less than 3 hours ago';
+      }
+      if (timeSinceLastActive >= 3 * 60 * 60000 && timeSinceLastActive < 12 * 60 * 60000) {
+        statusText = 'Active less than 12 hours ago';
+      }
+      if (timeSinceLastActive >= 12 * 60 * 60000 && timeSinceLastActive < 24 * 60 * 60000) {
+        statusText = 'Active less than 24 hours ago';
+      }
+      if (timeSinceLastActive > 24 * 60 * 60000 && node.users[mobiusNode.id].lastActiveTime > 0) {
+        statusColour = 'grey';
+        statusText = 'Active more than 24 hours ago';
+      }
+      if (node.users[mobiusNode.id].lastActiveTime === 0) {
+        statusColour = 'grey';
+        statusText = 'Never Active';
+      }
+      node.users[mobiusNode.id].status({
+        fill: statusColour,
+        shape: 'dot',
+        text: statusText,
+      });
+    };
+
     /**
      * Register a new Mobius node with this config node
      * @param  {Object} mobiusNode - The new node to register
@@ -206,50 +242,16 @@ module.exports = function (RED) {
           text: 'Connected',
         });
       }
-      node.users[mobiusNode.id].lastActiveTime = Date.now();
+      node.users[mobiusNode.id].lastActiveTime = 0;
       node.users[mobiusNode.id].on('send', () => {
-        console.log('Send event');
+        console.log(Date.now());
         node.users[mobiusNode.id].lastActiveTime = Date.now();
+        node.updateNodeStatus(mobiusNode);
+        console.log(node.users[mobiusNode.id].lastActiveTime);
       });
       node.users[mobiusNode.id].statusCheckLoop = setInterval(() => {
-        const timeSinceLastActive = Date.now() - node.users[mobiusNode.id].lastActiveTime;
-        console.log(timeSinceLastActive);
-        if (timeSinceLastActive < 15 * 60000) {
-          node.users[mobiusNode.id].status({
-            fill: 'green',
-            shape: 'dot',
-            text: 'Active less than 15 minutes ago',
-          });
-        }
-        if (timeSinceLastActive >= 15 * 60000 && timeSinceLastActive < 3 * 60 * 60000) {
-          node.users[mobiusNode.id].status({
-            fill: 'green',
-            shape: 'dot',
-            text: 'Active less than 3 hours ago',
-          });
-        }
-        if (timeSinceLastActive >= 3 * 60 * 60000 && timeSinceLastActive < 12 * 60 * 60000) {
-          node.users[mobiusNode.id].status({
-            fill: 'green',
-            shape: 'dot',
-            text: 'Active less than 12 hours ago',
-          });
-        }
-        if (timeSinceLastActive >= 12 * 60 * 60000 && timeSinceLastActive < 24 * 60 * 60000) {
-          node.users[mobiusNode.id].status({
-            fill: 'green',
-            shape: 'dot',
-            text: 'Active less than 24 hours ago',
-          });
-        }
-        if (timeSinceLastActive > 24 * 60 * 60000) {
-          node.users[mobiusNode.id].status({
-            fill: 'grey',
-            shape: 'dot',
-            text: 'Active more than 24 hours ago',
-          });
-        }
-      }, 10000);
+        node.updateNodeStatus(mobiusNode);
+      }, 60000);
     };
 
     /**
@@ -258,6 +260,7 @@ module.exports = function (RED) {
      * @param  {Function} done       - A callback to be run by the node after it has been deregistered
      */
     node.deregister = function (mobiusNode, done) {
+      clearInterval(node.users[mobiusNode.id].statusCheckLoop);
       delete node.users[mobiusNode.id];
       if (node.service) {
         try {

package/dist/nodes/mobius-object-cov.js

@@ -68,12 +68,10 @@ module.exports = function (RED) {
           ]);
         } else {
           node.send({ topic: response.uri, payload: allResources });
-          console.log(node.lastActiveTime);
         }
       });
 
       node.serviceConn.register(node);
-      console.log(node.statusCheckLoop);
 
       node.on('close', function (done) {
         node.serviceConn.deregister(node, done);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.86-beta.78",
+  "version": "2.5.86-beta.81",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",