node-red-contrib-mobius-flow-base 2.5.91 → 3.0.0-beta.13

package/dist/nodes/mobius-filter-by-rid-value.html

@@ -63,72 +63,85 @@ POSSIBILITY OF SUCH DAMAGE.
 </script>
 
 <script type="text/javascript">
-  RED.nodes.registerType('mobius filter by rid value',{
+  RED.nodes.registerType('mobius filter by rid value', {
     category: 'mobius',
-    color:"#8abff5",
+    color: '#8abff5',
     defaults: {
+      name: { value: '' },
+      pids: { value: '[]' },
+      func: { value: '' },
+      limit: { value: 100, validate: RED.validators.number() },
+      rid: { value: '', validate: RED.validators.regex(/^[A-Fa-f0-9][A-Fa-f0-9]$/) },
+      detailedOutput: { value: false },
+      service: {
+        value: '',
+        validate: function (v) {
+          if (v === '') {
+            return true;
+          }
+          let parts = v.split('/');
+          for (let lp = 0; lp < parts.length; lp++) {
+            if (parts[lp] === null || parts[lp] === '') {
+              return false;
+            }
+          }
+          if (parts.length === 2) {
+            return true;
+          }
+          return false;
+        },
+      },
+      connection: { type: 'mobius connection', required: true },
       outputs: {value:1},
-      name: {value:""},
-      pids: {value: "[]"},
-      func: {value:""},
-      limit: {value:100, validate:RED.validators.number()},
-      rid: {value:"", validate:RED.validators.regex(/^[A-Fa-f0-9][A-Fa-f0-9]$/)},
-      detailedOutput: {value:false},
-      service: {value:"", validate:function(v) {
-        if(v === '') { return true; }
-        let parts = v.split('/');
-        for(let lp = 0; lp < parts.length; lp++) {
-          if(parts[lp] === null || parts[lp] === '') { return false;}
-        }
-        if(parts.length === 2) { return true; }
-        return false;
-      }},
-      connection: {type:"mobius connection", required:true}
     },
-    inputs:1,
-    outputs:1,
+    inputs: 1,
+    outputs: 1,
     outputLabels: function (index) {
-      if(index === 0) return ("Filtered object list");
-      if(index === 1) return ("Full MOBiUS response");
+      if (index === 0) return 'Filtered object list';
+      if (index === 1) return 'Full MOBiUS response';
     },
-    icon: "mobius.png",
-    align: "left",
+    icon: 'mobius.png',
+    align: 'left',
     paletteLabel: 'filter by rid value',
-    label: function() {
-      if(this.name) {
+    label: function () {
+      if (this.name) {
         return this.name;
       } else {
-        return this.service ? `Filter - ${this.service} by RID ${this.rid}` : "filter by rid value";
+        return this.service ? `Filter - ${this.service} by RID ${this.rid}` : 'filter by rid value';
       }
     },
-    labelStyle: function() {
-      return this.name ? "node_label_italic":"";
+    labelStyle: function () {
+      return this.name ? 'node_label_italic' : '';
     },
-    oneditprepare: function() {
-      $("#node-input-pids").typedInput({
-        type:"json",
-        types:["json"]
+    oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 2 : 1);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 2 : 1);
+      });
+      $('#node-input-pids').typedInput({
+        type: 'json',
+        types: ['json'],
       });
       this.editor = RED.editor.createEditor({
         id: 'node-input-func-editor',
         mode: 'ace/mode/javascript',
-        value: this.func
+        value: this.func,
       });
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        $("#node-input-outputs").val(2);
-      } else {
-        $("#node-input-outputs").val(1);
-      }
+    oneditsave: function () {
+      // if ($('#node-input-detailedOutput').prop('checked')) {
+      //   $('#node-input-outputs').val(2);
+      // } else {
+      //   $('#node-input-outputs').val(1);
+      // }
       this.func = this.editor.getValue();
       this.editor.destroy();
       delete this.editor;
     },
-    oneditcancel: function() {
+    oneditcancel: function () {
       this.editor.destroy();
       delete this.editor;
-    }
+    },
   });
 </script>
 
@@ -197,6 +210,13 @@ POSSIBILITY OF SUCH DAMAGE.
   </ol>
 
   <h3>Details</h3>
+  <p>
+    The <code>Function</code> configuration property is string containing the JavaScript function used to test the resource value. The function must return <b>true</b> or <b>false</b>.
+    A few examples are shown below (The name v is used to represent the resource values in the following example. You can use any identifier of your choice):</br>
+    <code>(v) => { return v === 5; }</code><br>
+    <code>function test (v) { return v > 10 && v < 100; }</code><br>
+    <code>(v) => { return v.includes('test-string'); }</code>
+  </p>
   <p>Outputs 3 and 4 are only sent if <b>Use detailed outputs</b> is checked on the configuration page.</p>
   <p>Outputs 1, 2 and 3 are only sent if no error occurs. The <b>error</b> property in output 4
     can be used to determine if an error has occurred.</p>

package/dist/nodes/mobius-filter-by-rid-value.js

@@ -24,13 +24,13 @@
  POSSIBILITY OF SUCH DAMAGE.
  **/
 
- //    <input type="text" id="node-input-func" placeholder="Function used for filtering (return $PV === 0)">
+//    <input type="text" id="node-input-func" placeholder="Function used for filtering (return $PV === 0)">
 
 /* jshint elision: true */
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusFilterNode (n) {
+  function MobiusFilterNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.service = n.service;
@@ -45,7 +45,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -75,38 +75,45 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy'
+          text: 'Busy',
         });
-        node.serviceConn.filterObjectsByRIDValue(uri, pids, rid, limit, func, (err, response) => {
-          if (err) {
-            node.status({
-              fill: 'yellow',
-              shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code)
-            });
-            if (node.detailedOutput === true) {
-              node.send([null, {topic: uri, payload: { error: true, response: err }}]);
-            }
-          } else {
-            node.status({
-              fill: 'green',
-              shape: 'dot',
-              text: JSON.stringify(response.uri)
-            });
-            let uriList = [];
-            for (let lp = 0; lp < response.value.length; lp++) {
-              uriList.push(`${response.uri}/${response.value[lp].pid}/${response.value[lp].ins}`)
-            }
-            if (node.detailedOutput === true) {
-              node.send([
-                { topic: uri, payload: uriList },
-                { topic: uri, payload: { error: false, response: response } }
-              ]);
+        node.serviceConn.filterObjectsByRIDValue(
+          uri,
+          pids,
+          rid,
+          limit,
+          eval('(' + func + ')'),
+          (err, response) => {
+            if (err) {
+              node.status({
+                fill: 'yellow',
+                shape: 'dot',
+                text: 'Error: ' + JSON.stringify(err.code),
+              });
+              if (node.detailedOutput === true) {
+                node.send([null, { topic: uri, payload: { error: true, response: err } }]);
+              }
             } else {
-              node.send({ topic: uri, payload: uriList });
+              node.status({
+                fill: 'green',
+                shape: 'dot',
+                text: JSON.stringify(response.uri),
+              });
+              let uriList = [];
+              for (let lp = 0; lp < response.value.length; lp++) {
+                uriList.push(`${response.uri}/${response.value[lp].pid}/${response.value[lp].ins}`);
+              }
+              if (node.detailedOutput === true) {
+                node.send([
+                  { topic: uri, payload: uriList },
+                  { topic: uri, payload: { error: false, response: response } },
+                ]);
+              } else {
+                node.send({ topic: uri, payload: uriList });
+              }
             }
           }
-        });
+        );
       });
 
       node.serviceConn.register(node);

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

@@ -34,10 +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 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"><i class="fa fa-bars"></i> Subscriptions</label>
       <ol id="node-input-subs-container"></ol>
   </div>
+
+  <div id="mobsearch"></div>
 </script>
 
 <script type="text/javascript">
@@ -67,7 +69,7 @@ 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 ({
         addButton: "add",
@@ -86,6 +88,11 @@ 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="margin-left: 5px; 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'));
@@ -93,6 +100,15 @@ 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(mobiusSrvc, searchField, i, mobsearchOpts)
+          // *** END MOBSEARCH *** //
         }
       });
 
@@ -100,6 +116,20 @@ 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];

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

@@ -34,12 +34,16 @@ 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 class="form-row node-input-mobjects-container-row">
+  <div id="node-input-mobjects-container-row" class="form-row node-input-mobjects-container-row">
     <label for="node-input-mobjects-container"><i class="fa fa-bars"></i> Objects</label>
       <ol id="node-input-mobjects-container"></ol>
   </div>
+
+  <div id="mobsearch"></div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius get multi-object', {
     category: 'mobius',
@@ -67,11 +71,12 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
 
       /** Resize a object when it has changed */
       function resizeObject (mobject) {
         let newWidth = mobject.width();
-        mobject.find(".node-input-mobject-comment").width(newWidth - 270);
+        mobject.find(".node-input-mobject-comment").width(newWidth - 300);
       }
 
       /** Create the objects container and populate it */
@@ -92,21 +97,50 @@ POSSIBILITY OF SUCH DAMAGE.
 
           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: "margin-left: 5px; text-align: left;"}).appendTo(row);
+          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);
+          // resizeObject(container);
+
+          // *** MOBSEARCH *** //
+
+          if (!node.mobjects[i]) {
+            node.mobjects[i] = {uri: '', comment: ''}
+          }
+
+          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
+          // *** END MOBSEARCH *** //
+
         },
-        resizeItem: resizeObject
+        // resizeItem: resizeObject
       });
 
       // If no mobjects exists, create a default one
       if (!node.mobjects) {
         node.mobjects = [mobject = {uri: '', comment: ''}];
       }
+
+      // *** MOBSEARCH *** //
+
+      mobsearchOpts = {
+        htmlElementId: 'mobsearch',
+        list: node.mobjects,
+        containerRowName: 'node-input-mobjects-container-row',
+        containerName: 'node-input-mobjects-container',
+        containerSecondFieldName: 'node-input-mobject-comment',
+      };
+      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];

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

@@ -41,12 +41,16 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="object">Object - Resource PVs, URIs and Names</option>
     </select>
   </div>
-  <div class="form-row node-input-resources-container-row">
+  <div id="node-input-resources-container-row" class="form-row node-input-resources-container-row">
     <label for="node-input-resources-container"><i class="fa fa-bars"></i> Resources</label>
       <ol id="node-input-resources-container"></ol>
   </div>
+
+  <div id="mobsearch"></div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius get multi-resource', {
     category: 'mobius',
@@ -75,6 +79,7 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
 
       /** Resize a resource when it has changed */
       function resizeResource (resource) {
@@ -100,21 +105,49 @@ POSSIBILITY OF SUCH DAMAGE.
 
           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: "margin-left: 5px; text-align: left;"}).appendTo(row);
+          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);
+          //resizeResource(container);
+
+          // *** MOBSEARCH *** //
+          if (!node.resources[i]) {
+            node.resources[i] = {uri: '', comment: ''}
+          }
+          addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
+          // *** END MOBSEARCH *** //
+
         },
-        resizeItem: resizeResource
+        // resizeItem: resizeResource
       });
 
       // If no stat exists, create a default one
       if (!node.resources) {
         node.resources = [resource = {uri: '', comment: ''}];
       }
+
+      // *** MOBSEARCH *** //
+
+      mobsearchOpts = {
+        htmlElementId: 'mobsearch',
+        list: node.resources,
+        containerRowName: 'node-input-resources-container-row',
+        containerName: 'node-input-resources-container',
+        containerSecondFieldName: 'node-input-resources-comment',
+      };
+      initMobsearch.toRid_listed(mobiusSrvc, mobsearchOpts);
+
+      // *** END MOBSEARCH *** //
+
       // Populate list with all saved filters
       for (let i = 0; i < node.resources.length; i++) {
         let resource = node.resources[i];

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusFlowNode (n) {
+  function MobiusFlowNode(n) {
     RED.nodes.createNode(this, n);
     this.resources = n.resources;
     this.sendFormat = n.send;
@@ -39,7 +39,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.serviceConn.register(node);
@@ -48,7 +48,7 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy'
+          text: 'Busy',
         });
 
         for (const resource of node.resources) {
@@ -56,7 +56,7 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'URIs not Valid'
+              text: 'URIs not Valid',
             });
             if (done) {
               return done();
@@ -69,26 +69,27 @@ module.exports = function (RED) {
         }
         Promise.all(promiseChain)
           .then((values) => {
+            console.log(values);
             node.status({
               fill: 'green',
               shape: 'dot',
-              text: 'Done'
+              text: 'Done',
             });
             if (node.sendFormat === 'array') {
-              node.send({topic: msg.topic, payload: values});
+              node.send({ topic: msg.topic, payload: values });
             } else {
               let payload = values.reduce((obj, item) => {
                 obj[item.uri] = { pv: item.pv, name: item.name };
                 return obj;
               }, {});
-              node.send({topic: msg.topic, payload: payload});
+              node.send({ topic: msg.topic, payload: payload });
             }
           })
           .catch((err) => {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code)
+              text: 'Error: ' + JSON.stringify(err.code),
             });
             node.error('Mobius error reading resource ' + JSON.stringify(err));
           })
@@ -107,7 +108,7 @@ module.exports = function (RED) {
     }
   }
 
-  function validateResourceURI (uri) {
+  function validateResourceURI(uri) {
     let parts = uri.split('/');
     for (let lp = 0; lp < parts.length; lp++) {
       if (parts[lp] === null || parts[lp] === '') {
@@ -120,16 +121,16 @@ module.exports = function (RED) {
     return false;
   }
 
-  function readResource (node, uri) {
+  function readResource(node, uri) {
     return new Promise((resolve, reject) => {
       node.serviceConn.readResource(uri, (err, response) => {
         if (err) {
           reject(err);
         } else {
           if (node.sendFormat === 'array') {
-            resolve(response.value.pv);
+            resolve(response.data.pv);
           } else {
-            resolve({uri: uri, pv: response.value.pv, name: response.value.name});
+            resolve({ uri: uri, pv: response.data.pv, name: response.data.name });
           }
         }
       });

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

@@ -29,10 +29,18 @@ 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 class="form-row">
-    <label for="node-input-mobject"><i class="fa fa-tasks"></i> URI</label>
-    <input type="text" id="node-input-mobject" placeholder="Object URI (hid/sid/pid/ins)">
+
+  <hr>
+
+  <div id="instance-row">
+    <div class="form-row" id="input-row">
+      <label for="node-input-mobject"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="node-input-mobject" style="width:61%;" placeholder="Object URI (hid/sid/pid/ins)">
+    </div>
   </div>
+
+  <div id="mobsearch"></div>
+
   <div class="form-row">
     <label for="node-input-format"><i class="fa fa-bars"></i> Format</label>
     <select type="text" id="node-input-format" style="display: inline-block; width: auto; vertical-align: center;">
@@ -40,10 +48,12 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="rid">By RID</option>
     </select>
   </div>
+
   <div class="form-row">
     <label>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
     <label for="node-input-detailedOutput" style="width: 70%;"> Use detailed outputs</label>
+    <input type="hidden" id="node-input-outputs"/>
   </div>
   <hr>
   <div class="form-row">
@@ -52,6 +62,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius get object',{
     category: 'mobius',
@@ -70,7 +82,8 @@ POSSIBILITY OF SUCH DAMAGE.
         if(parts.length < 4 && parts[parts.length - 1] === '#') { return true; }
         return false;
       }},
-      connection: {type: "mobius connection", required: true}
+      connection: {type: "mobius connection", required: true},
+      outputs: {value:1},
     },
     inputs:1,
     outputs:1,
@@ -92,13 +105,28 @@ POSSIBILITY OF SUCH DAMAGE.
     labelStyle: function() {
       return this.name ? "node_label_italic":"";
     },
-    oneditsave: function() {
-      if($("#node-input-detailedOutput").prop('checked')) {
-        this.outputs = 3;
-      } else {
-        this.outputs = 1;
-      }
-    }
+    oneditprepare: function () {
+      $("#node-input-outputs").val(this.detailedOutput ? 3 : 1);
+      $("#node-input-detailedOutput").change(function() {
+        $("#node-input-outputs").val(this.checked ? 3 : 1);
+      });
+      var node = this;
+      let mobiusSrvc = $("#node-input-connection").val();
+
+      opts = {
+        htmlElementId: 'mobsearch',
+        uriFieldName: 'node-input-mobject',
+        inputRowId: 'input-row',
+      };
+      initMobsearch.toIns(mobiusSrvc, opts);
+    },
+    // oneditsave: function() {
+    //   if($("#node-input-detailedOutput").prop('checked')) {
+    //     this.outputs = 3;
+    //   } else {
+    //     this.outputs = 1;
+    //   }
+    // }
   });
 </script>