node-red-contrib-mobius-flow-base 2.5.86-beta.67 → 2.5.86-beta.70

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,29 +65,34 @@ 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 } },
                 ]);
               }
             }
@@ -106,4 +111,12 @@ 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-discover-object-list.html

@@ -58,23 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
       <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 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>
@@ -96,6 +80,8 @@ 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',
@@ -140,214 +126,6 @@ POSSIBILITY OF SUCH DAMAGE.
       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 ({
         addButton: "add uri",
@@ -385,17 +163,7 @@ POSSIBILITY OF SUCH DAMAGE.
             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();
-
-          });
+          addMobsearchListButton(searchField, i, mobsearchOpts)
           // *** END MOBSEARCH *** //
         }
       });
@@ -409,18 +177,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
       // *** MOBSEARCH *** //
 
-      function updateList() {
-        $("#node-input-subs-container").editableList('items').each(function (i) {
-          let sub = $(this);
-          let type = sub.find(".node-input-sub-type").val();
-          node.subscriptions[i].type = type;
-        })
-        $("#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);
-        }
-      }
+      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 *** //
 

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,54 +54,57 @@ 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) => {
+        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 {
               if (node.outputType === 'uris') {
+                const uris = [];
+                objectList.forEach((mobiusObject) => {
+                  uris.push(mobiusObject.uri);
+                });
                 node.send({
-                  topic: mobiusObject.uri,
-                  payload: mobiusObject.uri
+                  topic: msg.topic,
+                  payload: uris,
                 });
               } else {
                 node.send({
-                  topic: mobiusObject.uri,
-                  payload: mobiusObject
+                  topic: msg.topic,
+                  payload: objectList,
                 });
-              }  
-            });
-          } 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'
+
+            node.status({
+              fill: 'green',
+              shape: 'dot',
+              text: 'Done',
+            });
+          })
+          .catch(() => {
+            node.status({
+              fill: 'yellow',
+              shape: 'dot',
+              text: 'Failed discovery',
+            });
           });
-        });
         if (done) {
           done();
         }
@@ -131,7 +134,7 @@ module.exports = function (RED) {
                 pids: pids,
                 rid: node.rid,
                 func: node.func,
-                limit: node.limit
+                limit: node.limit,
               };
             } else {
               discoverParams = {
@@ -139,19 +142,21 @@ 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');
@@ -176,23 +181,28 @@ 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) {
@@ -202,7 +212,7 @@ module.exports = function (RED) {
         }
       });
     });
-  };
+  }
 
   function isIncluded(uri, subscriptions) {
     let include = false;
@@ -216,7 +226,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)) {
@@ -228,7 +238,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] === '') {
@@ -244,11 +254,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];
@@ -260,4 +270,12 @@ 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);
+  });
 };