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

package/dist/nodes/mobius-clear-resource.html

@@ -29,17 +29,10 @@ POSSIBILITY OF SUCH DAMAGE.
     <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
     <input type="text" id="node-input-connection">
   </div>
-
-  <hr>
-
-  <div id="instance-row">
-    <div class="form-row" id="input-row">
-      <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
-      <input type="text" id="node-input-resource" style="width:61%;" placeholder="HID/SID/PID/INS/RID">
-    </div>
+  <div class="form-row">
+    <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
+    <input type="text" id="node-input-resource" placeholder="Resource URI (hid/sid/pid/ins/rid)">
   </div>
-  <div id="mobsearch"></div>
-
   <div class="form-row">
     <label for="node-input-priority"><i class="fa fa-exclamation-triangle"></i> Priority</label>
     <input type="text" id="node-input-priority" placeholder="Priotity to clear">
@@ -56,8 +49,6 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
-<script src="common/mobsearch.js"></script>
-
 <script type="text/javascript">
   RED.nodes.registerType('mobius clear resource',{
     category: 'mobius',
@@ -99,17 +90,6 @@ POSSIBILITY OF SUCH DAMAGE.
     labelStyle: function() {
       return this.name ? "node_label_italic":"";
     },
-    oneditprepare: function () {
-      var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
-
-      opts = {
-        htmlElementId: 'mobsearch',
-        uriFieldName: 'node-input-resource',
-        inputRowId: 'input-row',
-      };
-      initMobsearch.toRid(mobiusSrvc, opts);
-    },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {
         this.outputs = 4;

package/dist/nodes/mobius-clear-resource.js

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusClearResourceNode(n) {
+  function MobiusClearResourceNode (n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.resource = n.resource;
@@ -40,7 +40,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected',
+        text: 'Disconnected'
       });
 
       node.on('input', function (msg) {
@@ -57,7 +57,7 @@ module.exports = function (RED) {
           node.status({
             fill: 'green',
             shape: 'ring',
-            text: 'Busy',
+            text: 'Busy'
           });
 
           node.serviceConn.clearResourcePriority(uri, pri, (err, response) => {
@@ -65,34 +65,29 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code),
+                text: 'Error: ' + JSON.stringify(err.code)
               });
               node.error('Mobius error clearing resource priority ' + JSON.stringify(err));
               if (node.detailedOutput === true) {
-                node.send([
-                  null,
-                  null,
-                  null,
-                  { topic: uri, payload: { error: true, response: err } },
-                ]);
+                node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
               }
             } else {
               node.status({
                 fill: 'green',
                 shape: 'dot',
-                text: JSON.stringify(response.value.pv),
+                text: JSON.stringify(response.value.pv)
               });
               if (node.detailedOutput === true) {
                 node.send([
                   { topic: uri, payload: response.value.pv },
                   { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                   { topic: uri, payload: response.value },
-                  { topic: uri, payload: { error: false, response: response } },
+                  { topic: uri, payload: { error: false, response: response } }
                 ]);
               } else {
                 node.send([
                   { topic: uri, payload: response.value.pv },
-                  { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
+                  { topic: uri, payload: { pv: response.value.pv, name: response.value.name } }
                 ]);
               }
             }
@@ -111,12 +106,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius clear resource', MobiusClearResourceNode);
-
-  RED.httpAdmin.get('/common/*', function (req, res) {
-    var options = {
-      root: __dirname + '/common/',
-      dotfiles: 'deny',
-    };
-    res.sendFile(req.params[0], options);
-  });
 };

package/dist/nodes/mobius-connection.js

@@ -206,6 +206,50 @@ module.exports = function (RED) {
           text: 'Connected',
         });
       }
+      node.users[mobiusNode.id].lastActiveTime = Date.now();
+      node.users[mobiusNode.id].on('send', () => {
+        console.log('Send event');
+        node.users[mobiusNode.id].lastActiveTime = Date.now();
+      });
+      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);
     };
 
     /**
@@ -520,30 +564,6 @@ module.exports = function (RED) {
     node.updateObjectInServiceConfig = function (hid, sid, pid, ins, config, callback) {
       node.service.srvcAPI.updateObjectInServiceConfig(hid, sid, pid, ins, config, callback);
     };
-
-    node.getNodeConfig = function (hid) {
-      return new Promise((resolve, reject) => {
-        node.service.srvcAPI.getNodeConfig(hid, (err, response) => {
-          if (!err) {
-            resolve(response);
-          } else {
-            reject(err);
-          }
-        });
-      });
-    };
-
-    node.getServiceConfigProm = function (hid, sid) {
-      return new Promise((resolve, reject) => {
-        node.service.srvcAPI.getServiceConfig(hid, sid, (err, response) => {
-          if (!err) {
-            resolve(response);
-          } else {
-            reject(err);
-          }
-        });
-      });
-    };
   }
 
   RED.nodes.registerType('mobius connection', MobiusConnectionNode);
@@ -604,71 +624,4 @@ module.exports = function (RED) {
       }
     }
   );
-
-  // Register the endpoint for node-red mobius discovery in node-red node config pages
-  RED.httpAdmin.get('/mdiscover', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    let uri = req.query.uri;
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Discover services failed - could not to connect to MOBiUS hub.');
-      throw new Error('Discover services failed - could not to connect to MOBiUS hub.');
-    } else {
-      uiDeviceDiscovery
-        .discover(conn, uri)
-        .then((response) => {
-          res.json(response);
-        })
-        .catch((err) => {
-          throw err;
-        });
-    }
-  });
-
-  // Register the endpoint for node-red mobius discovery in node-red node config pages
-  RED.httpAdmin.get('/mgetservices', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    let hid = req.query.hid;
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Get services failed - could not to connect to MOBiUS hub.');
-      throw new Error('Get services failed - could not to connect to MOBiUS hub.');
-    } else {
-      uiDeviceDiscovery
-        .getServiceList(conn, hid)
-        .then((response) => {
-          res.json(response);
-        })
-        .catch((err) => {
-          RED.log.warn(`Get services failed - ${err}`);
-        });
-    }
-  });
-
-  RED.httpAdmin.get('/mgetobjects', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    let hid = req.query.hid;
-    let sid = req.query.sid;
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Get objects failed - could not to connect to MOBiUS hub.');
-      throw new Error('Get objects failed - could not to connect to MOBiUS hub.');
-    } else {
-      uiDeviceDiscovery
-        .getObjectList(conn, hid, sid)
-        .then((response) => {
-          res.json(response);
-        })
-        .catch((err) => {
-          RED.log.warn(`Get objects failed - ${err}`);
-        });
-    }
-  });
-
-  RED.httpAdmin.get('/mgethid', RED.auth.needsPermission('serial.read'), function (req, res) {
-    let conn = RED.nodes.getNode(req.query.mobius);
-    if (conn === null || !conn.service.connected) {
-      RED.log.error('Get hid failed - could not to connect to MOBiUS hub.');
-      throw new Error('Get hid failed - could not to connect to MOBiUS hub.');
-    } else {
-      res.json(conn.service.srvcAPI.status.hubId);
-    }
-  });
 };

package/dist/nodes/mobius-discover-object-list.html

@@ -53,13 +53,10 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="array">Array of Items</option>
     </select>
   </div>
-  <div id="node-input-subs-container-row" class="form-row node-input-subs-container-row">
+  <div class="form-row node-input-subs-container-row">
     <label for="node-input-subs-container" style="width:105px;float:left;"><i class="fa fa-bars"></i> Discover</label>
       <ol id="node-input-subs-container"></ol>
   </div>
-
-  <div id="mobsearch"></div>
-
   <div class="form-row">
     <label for="node-input-useRIDValueFiltering" style="width:178px;float:left;"><i class="fa fa-filter"></i> Filter by Resource Value</label>
     <input type="checkbox" id="node-input-useRIDValueFiltering" style="display: inline-block; width: auto; vertical-align: top;">
@@ -80,8 +77,6 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
-<script src="common/mobsearch.js"></script>
-
 <script type="text/javascript">
   RED.nodes.registerType('mobius discover object list', {
     category: 'mobius',
@@ -124,7 +119,6 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
 
       /** Create the subs container and populate it */
       $('#node-input-subs-container').css('min-height', '200px').css('min-width', '345px').editableList ({
@@ -143,12 +137,7 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 150px; margin-left: 5px; text-align: left;"}).appendTo(row);
-          
-          // *** MOBSEARCH *** //
-          var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
-          // *** END MOBSEARCH *** //
-          
+          var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 170px; margin-left: 5px; text-align: left;"}).appendTo(row);
           var typeField = $('<select/>',{class: "node-input-sub-type", style: "width:auto; margin-left: 5px; text-align: center;"}).appendTo(row);
           typeField.append($("<option></option>").val('include').text('Include'));
           typeField.append($("<option></option>").val('exclude').text('Exclude'));
@@ -156,15 +145,6 @@ POSSIBILITY OF SUCH DAMAGE.
           // Populate the new stat
           uriField.val(subscription.uri);
           typeField.val(subscription.type);
-
-          // *** MOBSEARCH *** //
-
-          if (!node.subscriptions[i]) {
-            node.subscriptions[i] = {uri: '', type: 'include'}
-          }
-
-          addMobsearchListButton(searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
         }
       });
 
@@ -174,20 +154,7 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.subscriptions) {
         node.subscriptions = [subscription = {uri: '', type: 'include'}];
       }
-
-      // *** MOBSEARCH *** //
-
-      mobsearchOpts = {
-        htmlElementId: 'mobsearch',
-        list: node.subscriptions,
-        containerRowName: 'node-input-subs-container-row',
-        containerName: 'node-input-subs-container',
-        containerSecondFieldName: 'node-input-sub-type',
-      };
-      initMobsearch.toIns_listed(mobiusSrvc, mobsearchOpts);
-
-      // *** END MOBSEARCH *** //
-
+      // Populate list with all saved filters
       for (let i = 0; i < node.subscriptions.length; i++) {
         let subscription = node.subscriptions[i];
         $("#node-input-subs-container").editableList('addItem', subscription);

package/dist/nodes/mobius-discover-object-list.js

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusFlowNode(n) {
+  function MobiusFlowNode (n) {
     RED.nodes.createNode(this, n);
     this.subscriptions = n.subscriptions;
     this.sendType = n.send;
@@ -45,7 +45,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected',
+        text: 'Disconnected'
       });
 
       node.serviceConn.register(node);
@@ -54,57 +54,54 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy',
+          text: 'Busy'
         });
 
-        node
-          .discoverAllObjectURIs(msg)
-          .then((objectList) => {
-            if (node.sendType === 'individual') {
-              objectList.forEach((mobiusObject) => {
-                if (node.outputType === 'uris') {
-                  node.send({
-                    topic: mobiusObject.uri,
-                    payload: mobiusObject.uri,
-                  });
-                } else {
-                  node.send({
-                    topic: mobiusObject.uri,
-                    payload: mobiusObject,
-                  });
-                }
-              });
-            } else {
+        node.discoverAllObjectURIs(msg).then((objectList) => {
+          if (node.sendType === 'individual') {
+            objectList.forEach((mobiusObject) => {
               if (node.outputType === 'uris') {
-                const uris = [];
-                objectList.forEach((mobiusObject) => {
-                  uris.push(mobiusObject.uri);
-                });
                 node.send({
-                  topic: msg.topic,
-                  payload: uris,
+                  topic: mobiusObject.uri,
+                  payload: mobiusObject.uri
                 });
               } else {
                 node.send({
-                  topic: msg.topic,
-                  payload: objectList,
+                  topic: mobiusObject.uri,
+                  payload: mobiusObject
                 });
-              }
-            }
-
-            node.status({
-              fill: 'green',
-              shape: 'dot',
-              text: 'Done',
-            });
-          })
-          .catch(() => {
-            node.status({
-              fill: 'yellow',
-              shape: 'dot',
-              text: 'Failed discovery',
+              }  
             });
+          } else {
+            if (node.outputType === 'uris') {
+              const uris = [];
+              objectList.forEach((mobiusObject) => {
+                uris.push(mobiusObject.uri);
+              });
+              node.send({
+                topic: msg.topic,
+                payload: uris
+              });  
+            } else {
+              node.send({
+                topic: msg.topic,
+                payload: objectList
+              });  
+            }
+          }
+ 
+          node.status({
+            fill: 'green',
+            shape: 'dot',
+            text: 'Done'
+          });
+        }).catch(() => {
+          node.status({
+            fill: 'yellow',
+            shape: 'dot',
+            text: 'Failed discovery'
           });
+        });
         if (done) {
           done();
         }
@@ -134,7 +131,7 @@ module.exports = function (RED) {
                 pids: pids,
                 rid: node.rid,
                 func: node.func,
-                limit: node.limit,
+                limit: node.limit
               };
             } else {
               discoverParams = {
@@ -142,21 +139,19 @@ module.exports = function (RED) {
                 pids: pids,
                 rid: '00',
                 func: 'return true;',
-                limit: 512,
+                limit: 512
               };
             }
             try {
               let objects = await discover(node.serviceConn, discoverParams);
               for (let lp = 0; lp < objects.value.length; lp++) {
-                objects.value[lp][
-                  'uri'
-                ] = `${serviceURI}/${objects.value[lp].pid}/${objects.value[lp].ins}`;
+                objects.value[lp]['uri'] = `${serviceURI}/${objects.value[lp].pid}/${objects.value[lp].ins}`;
                 objectList.push(objects.value[lp]);
               }
             } catch (err) {
               node.warn(`Discover object failed for service (${serviceURI}) - ${err.message}`);
             }
-          }
+          } 
 
           if (objectList.length === 0) {
             throw new Error('No discovery data found');
@@ -181,28 +176,23 @@ module.exports = function (RED) {
             let profiles = await discover(serviceConn, `${hid}/${sid}`);
             let pids = [];
             for (const pid of profiles.value) {
-              if (
-                isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions) &&
-                !isExcluded(`${hid}/${sid}/${pid}/#`, subscriptions)
-              ) {
+              if (isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions) && !isExcluded(`${hid}/${sid}/${pid}/#`, subscriptions)) {
                 pids.push(pid);
-              }
+              }  
             }
             if (pids.length > 0) {
               discoveredProfiles.set(`${hid}/${sid}`, pids);
             }
           }
         } else {
-          RED.log.warn(
-            `Failed to discover objects for service ${service.id.split('/')[1]} as it is offline.`
-          );
+          RED.log.warn(`Failed to discover objects for service ${service.id.split('/')[1]} as it is offline.`);
         }
       }
       resolve(discoveredProfiles);
     });
   }
 
-  async function discover(serviceConn, params) {
+  async function discover (serviceConn, params) {
     return new Promise((resolve, reject) => {
       serviceConn.discover(params, (err, response) => {
         if (err) {
@@ -212,7 +202,7 @@ module.exports = function (RED) {
         }
       });
     });
-  }
+  };
 
   function isIncluded(uri, subscriptions) {
     let include = false;
@@ -226,7 +216,7 @@ module.exports = function (RED) {
     return include;
   }
 
-  function isExcluded(uri, subscriptions) {
+  function isExcluded (uri, subscriptions) {
     let exclude = false;
     for (const subscription of subscriptions) {
       if (subscription.type === 'exclude' && validateSubscription(subscription.uri)) {
@@ -238,7 +228,7 @@ module.exports = function (RED) {
     return exclude;
   }
 
-  function validateSubscription(uri) {
+  function validateSubscription (uri) {
     let parts = uri.split('/');
     for (let lp = 0; lp < parts.length; lp++) {
       if (parts[lp] === null || parts[lp] === '') {
@@ -254,11 +244,11 @@ module.exports = function (RED) {
     return false;
   }
 
-  function matchTopic(filter, topic) {
+  function matchTopic (filter, topic) {
     const filterArray = filter.split('/');
     const topicArray = topic.split('/');
     const length = filterArray.length < topicArray.length ? filterArray.length : topicArray.length;
-
+  
     for (let i = 0; i < length; ++i) {
       const left = filterArray[i];
       const right = topicArray[i];
@@ -270,12 +260,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius discover object list', MobiusFlowNode);
-
-  RED.httpAdmin.get('/common/*', function (req, res) {
-    var options = {
-      root: __dirname + '/common/',
-      dotfiles: 'deny',
-    };
-    res.sendFile(req.params[0], options);
-  });
 };

package/dist/nodes/mobius-flow-inject.html

@@ -34,16 +34,12 @@ POSSIBILITY OF SUCH DAMAGE.
     <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
     <input type="text" id="node-input-connection">
   </div>
-  <div id="node-input-subs-container-row" class="form-row node-input-subs-container-row">
+  <div class="form-row node-input-subs-container-row">
     <label for="node-input-subs-container"><i class="fa fa-bars"></i> Subscriptions</label>
       <ol id="node-input-subs-container"></ol>
   </div>
-
-  <div id="mobsearch"></div>
 </script>
 
-<script src="common/mobsearch.js"></script>
-
 <script type="text/javascript">
   RED.nodes.registerType('mobius flow inject', {
     category: 'mobius',
@@ -71,7 +67,6 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
 
       /** Create the subs container and populate it */
       $('#node-input-subs-container').css('min-height', '300px').css('min-width', '450px').editableList ({
@@ -91,11 +86,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
           var row = $('<div>URI</div>').appendTo(container);
           var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
-          
-          // *** MOBSEARCH *** //
-          var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
-          // *** END MOBSEARCH *** //
-          
           var typeField = $('<select/>',{class: "node-input-sub-type", style: "width:auto; margin-left: 5px; text-align: center;"}).appendTo(row);
           typeField.append($("<option></option>").val('include').text('Include'));
           typeField.append($("<option></option>").val('exclude').text('Exclude'));
@@ -103,15 +93,6 @@ POSSIBILITY OF SUCH DAMAGE.
           // Populate the new stat
           uriField.val(subscription.uri);
           typeField.val(subscription.type);
-
-          // *** MOBSEARCH *** //
-
-          if (!node.subscriptions[i]) {
-            node.subscriptions[i] = {uri: '', type: 'include'}
-          }
-
-          addMobsearchListButton(searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
         }
       });
 
@@ -119,20 +100,7 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.subscriptions) {
         node.subscriptions = [subscription = {uri: '', type: 'include'}];
       }
-
-      // *** MOBSEARCH *** //
-
-      mobsearchOpts = {
-        htmlElementId: 'mobsearch',
-        list: node.subscriptions,
-        containerRowName: 'node-input-subs-container-row',
-        containerName: 'node-input-subs-container',
-        containerSecondFieldName: 'node-input-sub-type',
-      };
-      initMobsearch.toIns_listed(mobiusSrvc, mobsearchOpts);
-
-      // *** END MOBSEARCH *** //
-
+      // Populate list with all saved filters
       for (let i = 0; i < node.subscriptions.length; i++) {
         let subscription = node.subscriptions[i];
         $("#node-input-subs-container").editableList('addItem', subscription);