node-red-contrib-mobius-flow-base 2.5.86-beta.104 → 2.5.86-beta.107

package/dist/nodes/mobius-connection.js

@@ -237,41 +237,88 @@ module.exports = function (RED) {
      */
     node.updateNodeStatus = function (mobiusNode) {
       node.users[mobiusNode.id] = mobiusNode;
-      switch (node.users[mobiusNode.id].statusType) {
-        case 'timeSinceLastActive':
-          node.users[mobiusNode.id].status(
-            node.buildLastActiveTimeStatus(node.users[mobiusNode.id].lastActiveTime)
-          );
-        case 'lastUri':
-          const uri = node.users[mobiusNode.id].latestUri;
-          if (uri !== '') {
-            node.users[mobiusNode.id].status({
-              fill: 'green',
-              shape: 'dot',
-              text: uri,
-            });
-          }
+      if (!node.users[mobiusNode.id].inError) {
+        console.log(node.users[mobiusNode.id].statusType);
+        switch (node.users[mobiusNode.id].statusType) {
+          case 'timeSinceLastActive':
+            console.log('A');
+            node.users[mobiusNode.id].status(
+              node.buildLastActiveTimeStatus(node.users[mobiusNode.id].lastActiveTime)
+            );
+          case 'lastUri':
+            console.log('B');
+            const uri = node.users[mobiusNode.id].latestUri;
+            if (uri !== '' && uri !== undefined) {
+              node.users[mobiusNode.id].status({
+                fill: 'green',
+                shape: 'dot',
+                text: uri,
+              });
+            }
+          case 'lastValue':
+            const value = node.users[mobiusNode.id].latestValue;
+            if (value !== '' && value !== undefined) {
+              node.users[mobiusNode.id].status({
+                fill: 'green',
+                shape: 'dot',
+                text: value,
+              });
+            }
+        }
+      } else {
+        node.users[mobiusNode.id].status({
+          fill: 'green',
+          shape: 'dot',
+          text: node.users[mobiusNode.id].latestErrMessage,
+        });
       }
     };
 
-    /**
-     * Update a given node's node latest URI record
-     * @param  {Object} mobiusNode - The node whos last URI record is to be updated
-     */
-    node.updateLatestUri = function (mobiusNode, uri) {
-      node.users[mobiusNode.id] = mobiusNode;
-      node.users[mobiusNode.id].latestUri = uri;
-      node.updateNodeStatus(mobiusNode);
-    };
-
-    /**
-     * Update a given node's node last active time
-     * @param  {Object} mobiusNode - The node whos last active time is to be updated
-     */
-    node.updateLastActiveTime = function (mobiusNode) {
-      node.users[mobiusNode.id] = mobiusNode;
-      node.users[mobiusNode.id].lastActiveTime = Date.now();
-      node.updateNodeStatus(mobiusNode);
+    // Information update functions to be used by node status
+    node.update = {
+      /**
+       * Update a given node's node last active time
+       * @param  {Object} mobiusNode - The node whos last active time is to be updated
+       */
+      lastActiveTime: (mobiusNode) => {
+        node.users[mobiusNode.id] = mobiusNode;
+        node.users[mobiusNode.id].lastActiveTime = Date.now();
+        node.users[mobiusNode.id].inError = false;
+        node.updateNodeStatus(mobiusNode);
+      },
+      /**
+       * Update a given node's node latest URI record
+       * @param  {Object} mobiusNode - The node whos last URI record is to be updated
+       * @param {string} uri - The latest uri to be sent by the node
+       */
+      latestUri: (mobiusNode, uri) => {
+        node.users[mobiusNode.id] = mobiusNode;
+        node.users[mobiusNode.id].latestUri = uri;
+        node.users[mobiusNode.id].inError = false;
+        node.updateNodeStatus(mobiusNode);
+      },
+      /**
+       * Update a given node's node latest URI record
+       * @param  {Object} mobiusNode - The node whos last URI record is to be updated
+       * @param {number} value - The latest value to be sent by the node
+       */
+      latestValue: (mobiusNode, value) => {
+        node.users[mobiusNode.id] = mobiusNode;
+        node.users[mobiusNode.id].latestValue = value;
+        node.users[mobiusNode.id].inError = false;
+        node.updateNodeStatus(mobiusNode);
+      },
+      /**
+       * Update a given node's node latest URI record
+       * @param  {Object} mobiusNode - The node whos last URI record is to be updated
+       * @param {number} value - The latest value to be sent by the node
+       */
+      errMessage: (mobiusNode, message) => {
+        node.users[mobiusNode.id] = mobiusNode;
+        node.users[mobiusNode.id].latestErrMessage = message;
+        node.users[mobiusNode.id].inError = true;
+        node.updateNodeStatus(mobiusNode);
+      },
     };
 
     /**
@@ -280,6 +327,7 @@ module.exports = function (RED) {
      */
     node.register = function (mobiusNode) {
       node.users[mobiusNode.id] = mobiusNode;
+      node.users[mobiusNode.id].inError = false;
       if (node.connected) {
         node.users[mobiusNode.id].status({
           fill: 'green',

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

@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
   <hr>
   <div class="form-row">
-    <label for="node-input-statusType" style="width: 140px;"><i class="fa fa-bars"></i> Status Display</label>
-    <select type="text" id="node-input-statusType" style="display: inline-block; width: 285px; vertical-align: center;">
+    <label for="node-input-statusType" style="width: 135px;"><i class="fa fa-square" style="color:##55aa88"></i> Status Display</label>
+    <select type="text" id="node-input-statusType" style="display: inline-block; width: 287px; vertical-align: center;">
       <option value="timeSinceLastActive">Show time since last active</option>
       <option value="lastUri">Show last URI</option>
     </select>

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

@@ -36,7 +36,6 @@ module.exports = function (RED) {
     this.format = n.format;
     this.include = n.include;
     this.serviceConn = RED.nodes.getNode(n.connection);
-    this.latestUri = '';
     this.statusType = n.statusType;
     var node = this;
 
@@ -47,8 +46,8 @@ module.exports = function (RED) {
         text: 'Disconnected',
       });
       node.serviceConn.subscribeToObjectCOV(node.object, this.id, (response) => {
-        node.serviceConn.updateLatestUri(node, response.uri);
-        node.serviceConn.updateLastActiveTime(node);
+        node.serviceConn.update.latestUri(node, response.uri);
+        node.serviceConn.update.lastActiveTime(node);
         let allResources = _.keyBy(
           response.value.resources,
           node.format === 'name' ? 'name' : 'rid'

package/package.json

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