node-red-contrib-mobius-flow-base 2.5.86-beta.77 → 2.5.86-beta.80

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

@@ -30,7 +30,7 @@
 const _ = require('lodash');
 
 module.exports = function (RED) {
-  function MobiusFlowNode(n) {
+  function MobiusFlowNode (n) {
     RED.nodes.createNode(this, n);
     this.subscriptions = n.subscriptions;
     this.serviceConn = RED.nodes.getNode(n.connection);
@@ -40,7 +40,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected',
+        text: 'Disconnected'
       });
 
       for (const subscription of node.subscriptions) {
@@ -61,7 +61,7 @@ module.exports = function (RED) {
     }
   }
 
-  function validateSubscription(uri) {
+  function validateSubscription (uri) {
     let parts = uri.split('/');
     for (let lp = 0; lp < parts.length; lp++) {
       if (parts[lp] === null || parts[lp] === '') {
@@ -83,24 +83,18 @@ module.exports = function (RED) {
    * @param  {string} messageTopic - The topic in an actual message
    * @return {boolean}             - True if the topics match, else false
    */
-  function matchTopic(topic, messageTopic) {
+  function matchTopic (topic, messageTopic) {
     if (topic === '#') {
       return true;
     }
     // eslint-disable-next-line no-useless-escape
-    var regex = new RegExp(
-      '^' +
-        topic
-          .replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g, '\\$1')
-          // eslint-disable-next-line no-useless-escape
-          .replace(/\+/g, '[^/]+')
-          .replace(/\/#$/, '(/.*)?') +
-        '$'
-    );
+    var regex = new RegExp('^' + topic.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g, '\\$1')
+    // eslint-disable-next-line no-useless-escape
+      .replace(/\+/g, '[^/]+').replace(/\/#$/, '(\/.*)?') + '$');
     return regex.test(messageTopic);
   }
 
-  function handleSubscription(node, response) {
+  function handleSubscription (node, response) {
     for (const subscription of node.subscriptions) {
       if (subscription.type === 'exclude') {
         if (matchTopic(subscription.uri, response.uri)) {
@@ -112,7 +106,7 @@ module.exports = function (RED) {
     node.status({
       fill: 'green',
       shape: 'dot',
-      text: JSON.stringify(response.uri),
+      text: JSON.stringify(response.uri)
     });
     let outObject = response.value;
     try {
@@ -127,12 +121,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius flow inject', 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-get-multi-object.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-mobjects-container-row" class="form-row node-input-mobjects-container-row">
+  <div 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',
@@ -78,8 +74,6 @@ POSSIBILITY OF SUCH DAMAGE.
         mobject.find(".node-input-mobject-comment").width(newWidth - 270);
       }
 
-      let mobiusSrvc = $("#node-input-connection").val();
-
       /** Create the objects container and populate it */
       $('#node-input-mobjects-container').css('min-height', '300px').css('min-width', '450px').editableList ({
         addButton: "add",
@@ -97,29 +91,14 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 180px; 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-mobject-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
           row.append('&nbsp;&nbsp;-&nbsp;');
-
-          var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "width: 120px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "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(searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
+          resizeObject(container);
         },
         resizeItem: resizeObject
       });
@@ -128,31 +107,19 @@ POSSIBILITY OF SUCH DAMAGE.
       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];
         $("#node-input-mobjects-container").editableList('addItem', mobject);
       }
     },
     oneditresize(size) {
-      var rows = $("#dialog-form>div:not(.node-input-mobjects-container)");
+      var rows = $("#dialog-form>div:not(.node-input-mobjects-container-row)");
       var height = size.height;
       for (var i=0; i<rows.size(); i++) {
         height -= $(rows[i]).outerHeight(true);
       }
-      var editorRow = $("#dialog-form>div.node-input-mobjects-container");
+      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);

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusFlowNode(n) {
+  function MobiusFlowNode (n) {
     RED.nodes.createNode(this, n);
     this.mobjects = n.mobjects;
     this.serviceConn = RED.nodes.getNode(n.connection);
@@ -38,7 +38,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected',
+        text: 'Disconnected'
       });
 
       node.serviceConn.register(node);
@@ -47,7 +47,7 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy',
+          text: 'Busy'
         });
 
         for (const mobject of node.mobjects) {
@@ -55,7 +55,7 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'URIs not Valid',
+              text: 'URIs not Valid'
             });
             if (done) {
               return done();
@@ -71,15 +71,15 @@ module.exports = function (RED) {
             node.status({
               fill: 'green',
               shape: 'dot',
-              text: 'Done',
+              text: 'Done'
             });
-            node.send({ topic: msg.topic, payload: values });
+            node.send({topic: msg.topic, payload: values});
           })
           .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 object ' + JSON.stringify(err));
           })
@@ -98,7 +98,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] === '') {
@@ -111,7 +111,7 @@ module.exports = function (RED) {
     return false;
   }
 
-  function readObject(node, uri) {
+  function readObject (node, uri) {
     return new Promise((resolve, reject) => {
       node.serviceConn.readObject(uri, (err, response) => {
         if (err) {
@@ -124,12 +124,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius get multi-object', 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-get-multi-resource.html

@@ -41,16 +41,12 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="object">Object - Resource PVs, URIs and Names</option>
     </select>
   </div>
-  <div id="node-input-resources-container-row" class="form-row node-input-resources-container-row">
+  <div 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',
@@ -86,8 +82,6 @@ POSSIBILITY OF SUCH DAMAGE.
         resource.find(".node-input-resource-comment").width(newWidth - 270);
       }
 
-      let mobiusSrvc = $("#node-input-connection").val();
-
       /** Create the subs container and populate it */
       $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
         addButton: "add",
@@ -105,26 +99,14 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-resource-uri", type: "text", style: "width: 190px; 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-resource-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
           row.append('&nbsp;&nbsp;-&nbsp;');
-          var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "width: 110px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "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(searchField, i, mobsearchOpts)
-          // *** END MOBSEARCH *** //
+          resizeResource(container);
         },
         resizeItem: resizeResource
       });
@@ -133,32 +115,19 @@ POSSIBILITY OF SUCH DAMAGE.
       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];
         $("#node-input-resources-container").editableList('addItem', resource);
       }
     },
     oneditresize(size) {
-      var rows = $("#dialog-form>div:not(.node-input-resources-container)");
+      var rows = $("#dialog-form>div:not(.node-input-resources-container-row)");
       var height = size.height;
       for (var i=0; i<rows.size(); i++) {
         height -= $(rows[i]).outerHeight(true);
       }
-      var editorRow = $("#dialog-form>div.node-input-resources-container");
+      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);

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();
@@ -72,23 +72,23 @@ module.exports = function (RED) {
             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 +107,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,7 +120,7 @@ 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) {
@@ -129,7 +129,7 @@ module.exports = function (RED) {
           if (node.sendFormat === 'array') {
             resolve(response.value.pv);
           } else {
-            resolve({ uri: uri, pv: response.value.pv, name: response.value.name });
+            resolve({uri: uri, pv: response.value.pv, name: response.value.name});
           }
         }
       });
@@ -137,12 +137,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius get multi-resource', 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-get-object.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-instance"><i class="fa fa-tasks"></i> URI</label>
-      <input type="text" id="node-input-instance" style="width:61%;" placeholder="HID/SID/PID/INS (optional name)">
-    </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)">
   </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;">
@@ -59,8 +52,6 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
-<script src="common/mobsearch.js"></script>
-
 <script type="text/javascript">
   RED.nodes.registerType('mobius get object',{
     category: 'mobius',
@@ -69,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value: ""},
       detailedOutput: {value:false},
       format: {value: "name", required: true},
-      instance: {value: "", validate:function(v) {
+      mobject: {value: "", validate:function(v) {
         if(v === '') { return true; }
         let parts = v.split('/');
         for(let lp = 0; lp < parts.length; lp++) {
@@ -95,24 +86,12 @@ POSSIBILITY OF SUCH DAMAGE.
       if(this.name) {
         return this.name;
       } else {
-        return this.instance ? `Get - ${this.instance}` : "get object";
+        return this.mobject ? `Get - ${this.mobject}` : "get object";
       }
     },
     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-instance ',
-        inputRowId: 'input-row',
-      };
-      initMobsearch.toIns(mobiusSrvc, opts);
-    },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {
         this.outputs = 3;

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

@@ -30,11 +30,11 @@
 const _ = require('lodash');
 
 module.exports = function (RED) {
-  function MobiusGetObjectNode(n) {
+  function MobiusGetObjectNode (n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.format = n.format;
-    this.instance = n.instance;
+    this.mobject = n.mobject;
     this.serviceConn = RED.nodes.getNode(n.connection);
     var node = this;
 
@@ -42,11 +42,11 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected',
+        text: 'Disconnected'
       });
 
       node.on('input', function (msg) {
-        let uri = node.instance;
+        let uri = node.mobject;
         if (msg.hasOwnProperty('topic') && require('./validateURI')(msg.topic, 4)) {
           uri = msg.topic;
         }
@@ -54,35 +54,32 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy',
+          text: 'Busy'
         });
         node.serviceConn.readObject(uri, (err, response) => {
           if (err) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code),
+              text: 'Error: ' + JSON.stringify(err.code)
             });
             node.error('Mobius error reading object ' + JSON.stringify(err));
             if (node.detailedOutput === true) {
-              node.send([null, null, { topic: uri, payload: { error: true, response: err } }]);
+              node.send([null, null, {topic: uri, payload: { error: true, response: err }}]);
             }
           } else {
             node.status({
               fill: 'green',
               shape: 'dot',
-              text: JSON.stringify(response.uri),
+              text: JSON.stringify(response.uri)
             });
 
-            let allResources = _.keyBy(
-              response.value.resources,
-              node.format === 'name' ? 'name' : 'rid'
-            );
+            let allResources = _.keyBy(response.value.resources, node.format === 'name' ? 'name' : 'rid');
             if (node.detailedOutput === true) {
               node.send([
                 { topic: uri, payload: allResources },
                 { 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: allResources });
@@ -102,12 +99,4 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius get object', MobiusGetObjectNode);
-
-  RED.httpAdmin.get('/common/*', function (req, res) {
-    var options = {
-      root: __dirname + '/common/',
-      dotfiles: 'deny',
-    };
-    res.sendFile(req.params[0], options);
-  });
 };

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

@@ -29,18 +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>&nbsp;</label>
     <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
@@ -53,8 +45,6 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
-<script src="common/mobsearch.js"></script>
-
 <script type="text/javascript">
   RED.nodes.registerType('mobius get resource',{
     category: 'mobius',
@@ -95,18 +85,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;