node-red-contrib-mobius-flow-base 2.5.86-beta.3 → 2.5.86-beta.33

package/dist/nodes/mobius-connection.js

@@ -520,6 +520,30 @@ 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);
@@ -599,4 +623,52 @@ module.exports = function (RED) {
         });
     }
   });
+
+  // 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,10 +53,29 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="array">Array of Items</option>
     </select>
   </div>
-  <div class="form-row node-input-subs-container-row">
+  <div id="node-input-subs-container-row" 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="instance-search-row">
+    <div class="form-row">
+      <label for="instance-search-sid"><i class="fa fa-search"></i> Search</label>
+      <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
+      <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
+      <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
+      <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
+      <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
+      <a id="node-search-accept" class="searchbutton" style="vertical-align: middle"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
+    </div>
+  </div>
+  <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
+    <p>Please note: The selection of wildcard '+'
+      means a search for a specific instance or resource
+      cannot be performed. As such, enter the 
+      INS manually.</p>
+  </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;">
@@ -119,6 +138,215 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
+
+      // *** MOBSEARCH *** //
+
+      $("#instance-search-row").hide();
+      $("#wildcard-alert-row").hide();
+      $("#node-search-return").addClass('disabled');
+      $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
+        $("#instance-search-hid").val(response);
+      })
+
+      let globalSubscriptionIndex = 0;
+
+      let searchObject = {
+        hid: '',
+        sid: '',
+        pid: '',
+        ins: '',
+        objects: []
+      }
+
+      //Function to search for INSs
+      function insSearch (objects, pid) {
+        let inss = ['#'];
+        for (let i = 0; i < objects.length; i++) {
+          if (objects[i].pid === pid) {
+            const name = objects[i].resources[1].pv;
+            if (name === '') {
+              inss.push(objects[i].ins);
+            } else {
+              inss.push(`${objects[i].ins} - ${name}`);
+            }
+          }
+        }
+        $("#instance-search-ins").autocomplete({
+          source: inss,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-ins").autocomplete('destroy');
+            if ($("#instance-search-ins").val().length > 4) {
+              $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
+            }
+            searchObject.ins = $("#instance-search-ins").val();
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Function to search for PIDs
+      function pidsSearch(objects) {
+        searchObject.objects = objects;
+        let pids = ['#', '+'];
+        for (let i = 0; i < objects.length; i++) {
+          pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
+        }
+        pids = [...new Set(pids)];
+        $("#instance-search-pid").autocomplete({
+          source: pids,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-pid").autocomplete('destroy');
+            if ($("#instance-search-pid").val().length > 4) {
+              $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
+            }
+            searchObject.pid = $("#instance-search-pid").val();
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Function to search for SIDs, and then fetch child objects based on selection
+      function serviceSearch(response) {
+        let services = ['#', '+'];
+        for (let i = 0; i < response.length; i++) {
+          if (response[i].sid !== '009') {
+            services.push(`${response[i].sid} - ${response[i].name}`);
+          }
+        }
+        $("#instance-search-sid").autocomplete({
+          source: services,
+          minLength: 0,
+          close: function (event, ui) {
+            acceptCheck();
+            $("#instance-search-sid").autocomplete('destroy');
+            if ($("#instance-search-sid").val().length > 3) {
+              $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
+            }
+            searchObject.sid = $("#instance-search-sid").val();
+            if (searchObject.sid === '+') {
+              for (let i = 2; i < services.length; i++) {
+                $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
+                  searchObject.objects = searchObject.objects.concat(objects);
+                })
+              }
+            } else {
+              $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
+                searchObject.objects = objects;
+              })
+            }
+          }
+        }).autocomplete('search', '');
+      }
+
+      //Start a new search
+      function startSearch() {
+        $("#wildcard-alert-row").hide();
+        $("#instance-search-sid").val('');
+        $("#instance-search-pid").val('');
+        $("#instance-search-ins").val('');
+        searchObject.hid = $("#instance-search-hid").val()
+        searchObject.sid = '';
+        searchObject.pid = '';
+        searchObject.ins = '';
+        searchObject.objects = [];
+        if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
+          $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
+            .fail((err) => {
+              console.log('Some kind of html failure message on service discovery');
+            });
+        }
+      }
+
+      //Finish a search
+      function finishSearch() {
+        $("#wildcard-alert-row").hide();
+        let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`
+        if (uri.includes('#')) {
+          uri = uri.substring(0,uri.indexOf('#') + 1)
+        }
+        node.subscriptions[globalSubscriptionIndex].uri = uri;
+        updateList()
+        $("#node-search-accept").css('color', '#CCCCCC');
+        readyToAccept = false;
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#instance-search-row").hide();
+        $('#node-input-subs-container-row').show();
+      }
+
+      //Function to update if accept button is grade out and functions based on conditions of fields
+      function acceptCheck() {
+        if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '') ||
+        $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#') {
+          $("#node-search-accept").css('color', '#555555');
+          readyToAccept = true;
+        } else {
+          $("#node-search-accept").css('color', '#CCCCCC');
+          readyToAccept = false;
+        }
+        if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+') {
+          $("#wildcard-alert-row").hide();
+        } else {
+          $("#wildcard-alert-row").show();
+        }
+      }
+
+      $("#instance-search-sid").click(function () {     //SID field clicked
+        $("#instance-search-pid").val('')
+        $("#instance-search-ins").val('')
+        searchObject.pid = '';
+        searchObject.ins = '';
+        searchObject.objects = [];
+        startSearch();
+      })
+      $("#instance-search-pid").click(function () {    //PID field clicked
+        $("#instance-search-ins").val('')
+        searchObject.ins = '';
+        if (searchObject.sid !== '') {
+          pidsSearch(searchObject.objects);
+        }
+      })
+      $("#instance-search-ins").click(function () {   //INS field clicked
+        if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
+          insSearch(searchObject.objects, searchObject.pid);
+        }
+      })
+      $("#node-search-return").click(function () {    //Return/Back button clicked
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#instance-search-row").hide();
+        $('#node-input-subs-container-row').show();
+      });
+      $("#node-search-accept").click(function () {    //Accept button clicked
+        if (readyToAccept) {
+          finishSearch();
+        }
+      });
+
+      // Respond to search field changes
+      $("#instance-search-hid").change(function () {
+        acceptCheck();
+        $("#instance-search-sid").val('');
+        $("#instance-search-pid").val('');
+        $("#instance-search-ins").val('');
+      });
+      $("#instance-search-sid").change(function () {
+        searchObject.sid = $("#instance-search-sid").val()
+        acceptCheck();
+      });
+      $("#instance-search-pid").change(function () {
+        searchObject.pid = $("#instance-search-pid").val()
+        acceptCheck();
+      });
+      $("#instance-search-ins").change(function () {
+        searchObject.ins = $("#instance-search-ins").val()
+        acceptCheck();
+      });
+
+      // *** END MOBSEARCH *** //
 
       /** Create the subs container and populate it */
       $('#node-input-subs-container').css('min-height', '200px').css('min-width', '345px').editableList ({
@@ -137,7 +365,12 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 170px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          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 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'));
@@ -145,6 +378,25 @@ 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'}
+          }
+
+          searchField.click(function () {
+            globalSubscriptionIndex = i;
+            $('#node-input-subs-container-row').hide();
+            $("#instance-search-sid").val('');
+            $("#instance-search-pid").val('');
+            $("#instance-search-ins").val('');
+            $("#node-search-return").removeClass('disabled');
+            $("#node-search-accept").removeClass('disabled');
+            $("#instance-search-row").show();
+
+          });
+          // *** END MOBSEARCH *** //
         }
       });
 
@@ -154,11 +406,19 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.subscriptions) {
         node.subscriptions = [subscription = {uri: '', type: 'include'}];
       }
-      // 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);
+
+      // *** MOBSEARCH *** //
+
+      function updateList() {
+        $("#node-input-subs-container").editableList('empty');
+        for (let i = 0; i < node.subscriptions.length; i++) {
+          let subscription = node.subscriptions[i];
+          $("#node-input-subs-container").editableList('addItem', subscription);
+        }
       }
+      updateList()
+
+      // *** END MOBSEARCH *** //
 
       function showRIDFilterInputs() {
         if($("#node-input-useRIDValueFiltering").is(':checked')) {