node-red-contrib-mobius-flow-base 3.2.0 → 3.3.0

package/dist/nodes/mobius-get-multi-object.html

@@ -24,7 +24,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<script type="text/x-red" data-template-name="mobius get multi-object">
+<script
+  type="text/x-red"
+  data-template-name="mobius get multi-object"
+>
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
@@ -48,84 +51,96 @@ POSSIBILITY OF SUCH DAMAGE.
   RED.nodes.registerType('mobius get multi-object', {
     category: 'mobius',
     defaults: {
-      name: {value:""},
-      mobjects: {value:[{uri: '', comment: ''}]},
-      connection: {type:"mobius connection", required:true}
+      name: { value: '' },
+      mobjects: { value: [{ uri: '', comment: '' }] },
+      connection: { type: 'mobius connection', required: true },
     },
-    color:"#9ee3fa",
-    inputs:1,
-    outputs:1,
-    outputLabels: ["MOBiUS objects"],
-    icon: "mobius.png",
-    align: "left",
+    color: '#9ee3fa',
+    inputs: 1,
+    outputs: 1,
+    outputLabels: ['MOBiUS objects'],
+    icon: 'mobius.png',
+    align: 'left',
     paletteLabel: 'get multi-object',
-    label: function() {
-      if(this.name) {
+    label: function () {
+      if (this.name) {
         return this.name;
       } else {
-        return "get multi-object";
+        return 'get multi-object';
       }
     },
-    labelStyle: function() {
-      return this.name ? "node_label_italic":"";
+    labelStyle: function () {
+      return this.name ? 'node_label_italic' : '';
     },
     oneditprepare: function () {
       var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
+      let mobiusSrvc = $('#node-input-connection').val();
 
       /** Resize a object when it has changed */
-      function resizeObject (mobject) {
+      function resizeObject(mobject) {
         let newWidth = mobject.width();
-        mobject.find(".node-input-mobject-comment").width(newWidth - 300);
+        mobject.find('.node-input-mobject-comment').width(newWidth - 300);
       }
 
       /** Create the objects container and populate it */
-      $('#node-input-mobjects-container').css('min-height', '300px').css('min-width', '450px').editableList ({
-        addButton: "add",
-        removable: true,
-        sortable: true,
-        addItem: function (container, i, mobject) {
-          container.css({
-            overflow: 'hidden',
-            whiteSpace: 'nowrap'
-          });
-
-          // Add a default resource if it does not exist
-          if (!mobject.hasOwnProperty("uri")) {
-            mobject = {uri: '', comment: ''};
-          }
-
-          var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
-
-          // *** MOBSEARCH *** //
-          var searchField = $('<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
-          // *** END MOBSEARCH *** //
-
-          row.append('&nbsp;&nbsp;-&nbsp;');
-          var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "width: 35%; margin-left: 5px; text-align: left;"}).appendTo(row);
-
-          // Populate the new stat
-          uriField.val(mobject.uri);
-          commentField.val(mobject.comment);
-          // resizeObject(container);
-
-          // *** MOBSEARCH *** //
-
-          if (!node.mobjects[i]) {
-            node.mobjects[i] = {uri: '', comment: ''}
-          }
-
-          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
-
-        },
-        // resizeItem: resizeObject
-      });
+      $('#node-input-mobjects-container')
+        .css('min-height', '300px')
+        .css('min-width', '450px')
+        .editableList({
+          addButton: 'add',
+          removable: true,
+          sortable: true,
+          addItem: function (container, i, mobject) {
+            container.css({
+              overflow: 'hidden',
+              whiteSpace: 'nowrap',
+            });
+
+            // Add a default resource if it does not exist
+            if (!mobject.hasOwnProperty('uri')) {
+              mobject = { uri: '', comment: '' };
+            }
+
+            var row = $('<div>URI</div>').appendTo(container);
+            var uriField = $('<input/>', {
+              class: 'node-input-mobject-uri',
+              type: 'text',
+              style: 'width: 200px; margin-left: 5px; text-align: left;',
+            }).appendTo(row);
+
+            // *** MOBSEARCH *** //
+            var searchField = $(
+              '<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>'
+            ).appendTo(row);
+            // *** END MOBSEARCH *** //
+
+            row.append('&nbsp;&nbsp;-&nbsp;');
+            var commentField = $('<input/>', {
+              class: 'node-input-mobject-comment',
+              type: 'text',
+              style: 'width: 35%; margin-left: 5px; text-align: left;',
+            }).appendTo(row);
+
+            // Populate the new stat
+            uriField.val(mobject.uri);
+            commentField.val(mobject.comment);
+            // resizeObject(container);
+
+            // *** MOBSEARCH *** //
+
+            if (!node.mobjects[i]) {
+              node.mobjects[i] = { uri: '', comment: '' };
+            }
+
+            addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts);
+            // *** END MOBSEARCH *** //
+          },
+          // resizeItem: resizeObject
+        });
 
       // If no mobjects exists, create a default one
       if (!node.mobjects) {
-        node.mobjects = [mobject = {uri: '', comment: ''}];
+        node.mobjects = [(mobject = { uri: '', comment: '' })];
       }
 
       // *** MOBSEARCH *** //
@@ -136,43 +151,50 @@ POSSIBILITY OF SUCH DAMAGE.
         containerRowName: 'node-input-mobjects-container-row',
         containerName: 'node-input-mobjects-container',
         containerSecondFieldName: 'node-input-mobject-comment',
+        removeWildcards: true,
       };
       initMobsearch.toIns_listed(mobiusSrvc, mobsearchOpts);
 
       // *** END MOBSEARCH *** //
-      
+
       // Populate list with all saved filters
       for (let i = 0; i < node.mobjects.length; i++) {
         let mobject = node.mobjects[i];
-        $("#node-input-mobjects-container").editableList('addItem', mobject);
+        $('#node-input-mobjects-container').editableList('addItem', mobject);
       }
     },
     oneditresize(size) {
-      var rows = $("#dialog-form>div:not(.node-input-mobjects-container-row)");
+      var rows = $('#dialog-form>div:not(.node-input-mobjects-container-row)');
       var height = size.height;
-      for (var i=0; i<rows.size(); i++) {
+      for (var i = 0; i < rows.size(); i++) {
         height -= $(rows[i]).outerHeight(true);
       }
-      var editorRow = $("#dialog-form>div.node-input-mobjects-container-row");
-      height -= 4 * ((parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom"))));
+      var editorRow = $('#dialog-form>div.node-input-mobjects-container-row');
+      height -=
+        4 *
+        (parseInt(editorRow.css('marginTop')) +
+          parseInt(editorRow.css('marginBottom')));
 
-      $("#node-input-mobjects-container").editableList('height',height);
+      $('#node-input-mobjects-container').editableList('height', height);
     },
-    oneditsave: function() {
-      let mobjects = $("#node-input-mobjects-container").editableList('items');
+    oneditsave: function () {
+      let mobjects = $('#node-input-mobjects-container').editableList('items');
       let node = this;
-      node.mobjects= [];
+      node.mobjects = [];
       mobjects.each(function (i) {
         let mobject = $(this);
-        let uri = mobject.find(".node-input-mobject-uri").val();
-        let comment = mobject.find(".node-input-mobject-comment").val();
-        node.mobjects.push({uri: uri, comment: comment});
+        let uri = mobject.find('.node-input-mobject-uri').val();
+        let comment = mobject.find('.node-input-mobject-comment').val();
+        node.mobjects.push({ uri: uri, comment: comment });
       });
-    }
+    },
   });
 </script>
 
-<script type="text/x-red" data-help-name="mobius get multi-object">
+<script
+  type="text/x-red"
+  data-help-name="mobius get multi-object"
+>
   <p>Read multiple MOBiUS object values.</p>
 
   <h3>Configuration Page</h3>

package/dist/nodes/mobius-get-multi-object.js

@@ -34,6 +34,10 @@ module.exports = function (RED) {
     this.serviceConn = RED.nodes.getNode(n.connection);
     var node = this;
 
+    const uriValidTest = new RegExp(
+      `^[0-9A-Fa-f]{6}/[0-9A-Fa-f]{3}/[0-9A-Fa-f]{4}/[0-9A-Fa-f]{4}$`
+    );
+
     if (node.serviceConn) {
       node.status({
         fill: 'red',
@@ -51,11 +55,11 @@ module.exports = function (RED) {
         });
 
         for (const mobject of node.mobjects) {
-          if (!validateResourceURI(mobject.uri)) {
+          if (!uriValidTest.test(mobject.uri)) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'URIs not Valid',
+              text: 'Error: URIs not Valid',
             });
             if (done) {
               return done();
@@ -79,12 +83,24 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: `Error: ${err.code ? err.code : 'Unknown'}`,
+              text: (() => {
+                if (err.response.status === 404) {
+                  return `Error: One or more objects not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}`;
+                }
+              })(),
             });
             node.error(
-              `Mobius error reading object: ${
-                err.code ? err.code : 'Unknown'
-              }, ${err.message ? err.message : ''}`
+              (() => {
+                if (err.response.status === 404) {
+                  return `Error: One or more objects not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}, ${
+                    err.message ? err.message : ''
+                  }`;
+                }
+              })()
             );
           })
           .finally(() => {
@@ -102,19 +118,6 @@ module.exports = function (RED) {
     }
   }
 
-  function validateResourceURI(uri) {
-    let parts = uri.split('/');
-    for (let lp = 0; lp < parts.length; lp++) {
-      if (parts[lp] === null || parts[lp] === '') {
-        return false;
-      }
-    }
-    if (parts.length === 4) {
-      return true;
-    }
-    return false;
-  }
-
   function readObject(node, uri) {
     return new Promise((resolve, reject) => {
       node.serviceConn.readObject(uri, (err, response) => {

package/dist/nodes/mobius-get-multi-resource.html

@@ -24,7 +24,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<script type="text/x-red" data-template-name="mobius get multi-resource">
+<script
+  type="text/x-red"
+  data-template-name="mobius get multi-resource"
+>
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
@@ -55,84 +58,96 @@ POSSIBILITY OF SUCH DAMAGE.
   RED.nodes.registerType('mobius get multi-resource', {
     category: 'mobius',
     defaults: {
-      name: {value:""},
-      send: {value: "array", required: true},
-      resources: {value:[{uri: '', comment: ''}]},
-      connection: {type:"mobius connection", required:true}
+      name: { value: '' },
+      send: { value: 'array', required: true },
+      resources: { value: [{ uri: '', comment: '' }] },
+      connection: { type: 'mobius connection', required: true },
     },
-    color:"#9ee3fa",
-    inputs:1,
-    outputs:1,
-    outputLabels: ["MOBiUS resources"],
-    icon: "mobius.png",
-    align: "left",
+    color: '#9ee3fa',
+    inputs: 1,
+    outputs: 1,
+    outputLabels: ['MOBiUS resources'],
+    icon: 'mobius.png',
+    align: 'left',
     paletteLabel: 'get multi-resource',
-    label: function() {
-      if(this.name) {
+    label: function () {
+      if (this.name) {
         return this.name;
       } else {
-        return "get multi-resource";
+        return 'get multi-resource';
       }
     },
-    labelStyle: function() {
-      return this.name ? "node_label_italic":"";
+    labelStyle: function () {
+      return this.name ? 'node_label_italic' : '';
     },
     oneditprepare: function () {
       var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
+      let mobiusSrvc = $('#node-input-connection').val();
 
       /** Resize a resource when it has changed */
-      function resizeResource (resource) {
+      function resizeResource(resource) {
         let newWidth = resource.width();
-        resource.find(".node-input-resource-comment").width(newWidth - 270);
+        resource.find('.node-input-resource-comment').width(newWidth - 270);
       }
 
       /** Create the subs container and populate it */
-      $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
-        addButton: "add",
-        removable: true,
-        sortable: true,
-        addItem: function (container, i, resource) {
-          container.css({
-            overflow: 'hidden',
-            whiteSpace: 'nowrap'
-          });
-
-          // Add a default resource if it does not exist
-          if (!resource.hasOwnProperty("uri")) {
-            resource = {uri: '', comment: ''};
-          }
-
-          var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-resource-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
-          
-          // *** MOBSEARCH *** //
-          var searchField = $('<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
-          
-          // *** END MOBSEARCH *** //
-          
-          row.append('&nbsp;&nbsp;-&nbsp;');
-          var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "width: 35%; margin-left: 5px; text-align: left;"}).appendTo(row);
-
-          // Populate the new stat
-          uriField.val(resource.uri);
-          commentField.val(resource.comment);
-          //resizeResource(container);
-
-          // *** MOBSEARCH *** //
-          if (!node.resources[i]) {
-            node.resources[i] = {uri: '', comment: ''}
-          }
-          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
-
-        },
-        // resizeItem: resizeResource
-      });
+      $('#node-input-resources-container')
+        .css('min-height', '300px')
+        .css('min-width', '450px')
+        .editableList({
+          addButton: 'add',
+          removable: true,
+          sortable: true,
+          addItem: function (container, i, resource) {
+            container.css({
+              overflow: 'hidden',
+              whiteSpace: 'nowrap',
+            });
+
+            // Add a default resource if it does not exist
+            if (!resource.hasOwnProperty('uri')) {
+              resource = { uri: '', comment: '' };
+            }
+
+            var row = $('<div>URI</div>').appendTo(container);
+            var uriField = $('<input/>', {
+              class: 'node-input-resource-uri',
+              type: 'text',
+              style: 'width: 200px; margin-left: 5px; text-align: left;',
+            }).appendTo(row);
+
+            // *** MOBSEARCH *** //
+            var searchField = $(
+              '<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>'
+            ).appendTo(row);
+
+            // *** END MOBSEARCH *** //
+
+            row.append('&nbsp;&nbsp;-&nbsp;');
+            var commentField = $('<input/>', {
+              class: 'node-input-resource-comment',
+              type: 'text',
+              style: 'width: 35%; margin-left: 5px; text-align: left;',
+            }).appendTo(row);
+
+            // Populate the new stat
+            uriField.val(resource.uri);
+            commentField.val(resource.comment);
+            //resizeResource(container);
+
+            // *** MOBSEARCH *** //
+            if (!node.resources[i]) {
+              node.resources[i] = { uri: '', comment: '' };
+            }
+            addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts);
+            // *** END MOBSEARCH *** //
+          },
+          // resizeItem: resizeResource
+        });
 
       // If no stat exists, create a default one
       if (!node.resources) {
-        node.resources = [resource = {uri: '', comment: ''}];
+        node.resources = [(resource = { uri: '', comment: '' })];
       }
 
       // *** MOBSEARCH *** //
@@ -143,6 +158,7 @@ POSSIBILITY OF SUCH DAMAGE.
         containerRowName: 'node-input-resources-container-row',
         containerName: 'node-input-resources-container',
         containerSecondFieldName: 'node-input-resources-comment',
+        removeWildcards: true,
       };
       initMobsearch.toRid_listed(mobiusSrvc, mobsearchOpts);
 
@@ -151,35 +167,43 @@ POSSIBILITY OF SUCH DAMAGE.
       // Populate list with all saved filters
       for (let i = 0; i < node.resources.length; i++) {
         let resource = node.resources[i];
-        $("#node-input-resources-container").editableList('addItem', resource);
+        $('#node-input-resources-container').editableList('addItem', resource);
       }
     },
     oneditresize(size) {
-      var rows = $("#dialog-form>div:not(.node-input-resources-container-row)");
+      var rows = $('#dialog-form>div:not(.node-input-resources-container-row)');
       var height = size.height;
-      for (var i=0; i<rows.size(); i++) {
+      for (var i = 0; i < rows.size(); i++) {
         height -= $(rows[i]).outerHeight(true);
       }
-      var editorRow = $("#dialog-form>div.node-input-resources-container-row");
-      height -= 4 * ((parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom"))));
+      var editorRow = $('#dialog-form>div.node-input-resources-container-row');
+      height -=
+        4 *
+        (parseInt(editorRow.css('marginTop')) +
+          parseInt(editorRow.css('marginBottom')));
 
-      $("#node-input-resources-container").editableList('height',height);
+      $('#node-input-resources-container').editableList('height', height);
     },
-    oneditsave: function() {
-      let resources = $("#node-input-resources-container").editableList('items');
+    oneditsave: function () {
+      let resources = $('#node-input-resources-container').editableList(
+        'items'
+      );
       let node = this;
-      node.resources= [];
+      node.resources = [];
       resources.each(function (i) {
         var resource = $(this);
-        let uri = resource.find(".node-input-resource-uri").val();
-        let comment = resource.find(".node-input-resource-comment").val();
-        node.resources.push({uri: uri, comment: comment});
+        let uri = resource.find('.node-input-resource-uri').val();
+        let comment = resource.find('.node-input-resource-comment').val();
+        node.resources.push({ uri: uri, comment: comment });
       });
-    }
+    },
   });
 </script>
 
-<script type="text/x-red" data-help-name="mobius get multi-resource">
+<script
+  type="text/x-red"
+  data-help-name="mobius get multi-resource"
+>
   <p>Read multiple MOBiUS object resource values.</p>
 
   <h3>Configuration Page</h3>

package/dist/nodes/mobius-get-multi-resource.js

@@ -35,6 +35,10 @@ module.exports = function (RED) {
     this.serviceConn = RED.nodes.getNode(n.connection);
     var node = this;
 
+    const uriValidTest = new RegExp(
+      `^[0-9A-Fa-f]{6}/[0-9A-Fa-f]{3}/[0-9A-Fa-f]{4}/[0-9A-Fa-f]{4}/[0-9A-Fa-f]{2}$`
+    );
+
     if (node.serviceConn) {
       node.status({
         fill: 'red',
@@ -52,11 +56,11 @@ module.exports = function (RED) {
         });
 
         for (const resource of node.resources) {
-          if (!validateResourceURI(resource.uri)) {
+          if (!uriValidTest.test(resource.uri)) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'URIs not Valid',
+              text: 'Error: URIs not Valid',
             });
             if (done) {
               return done();
@@ -88,12 +92,24 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: `Error: ${err.code ? err.code : 'Unknown'}`,
+              text: (() => {
+                if (err.response.status === 404) {
+                  return `Error: One or more resources not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}`;
+                }
+              })(),
             });
             node.error(
-              `Mobius error reading resource: ${
-                err.code ? err.code : 'Unknown'
-              }, ${err.message ? err.message : ''}`
+              (() => {
+                if (err.response.status === 404) {
+                  return `Error: One or more resources not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}, ${
+                    err.message ? err.message : ''
+                  }`;
+                }
+              })()
             );
           })
           .finally(() => {
@@ -111,19 +127,6 @@ module.exports = function (RED) {
     }
   }
 
-  function validateResourceURI(uri) {
-    let parts = uri.split('/');
-    for (let lp = 0; lp < parts.length; lp++) {
-      if (parts[lp] === null || parts[lp] === '') {
-        return false;
-      }
-    }
-    if (parts.length === 5) {
-      return true;
-    }
-    return false;
-  }
-
   function readResource(node, uri) {
     return new Promise((resolve, reject) => {
       node.serviceConn.readResource(uri, (err, response) => {