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

package/dist/engine-api-calls.js

@@ -48,8 +48,12 @@ class EngineApiCalls {
                 callback(null, response.data);
             }
             catch (err) {
-                console.log(err);
-                callback(err);
+                if (err.response?.status === 404) {
+                    callback(null, { ts: new Date().toISOString(), uri, data: [] });
+                }
+                else {
+                    callback(err);
+                }
             }
         };
         this.loggedIn ? func() : this.messageQueue.queue.push(func);
@@ -228,11 +232,27 @@ class EngineApiCalls {
                 if (!this.apiClient)
                     throw new Error('No API client set');
                 const discoveries = [];
+                const discoverOnPid = (pid) => {
+                    return (async () => {
+                        try {
+                            const response = await this.apiClient({
+                                method: 'get',
+                                url: `/mobius/discover/${uri}/${pid}`,
+                            });
+                            return response;
+                        }
+                        catch (err) {
+                            if (err.response?.status === 404) {
+                                return { data: { data: [], uri: uri } };
+                            }
+                            else {
+                                throw err;
+                            }
+                        }
+                    })();
+                };
                 for (let pid of pids) {
-                    discoveries.push(this.apiClient({
-                        method: 'get',
-                        url: `/mobius/discover/${uri}/${pid}`,
-                    }));
+                    discoveries.push(discoverOnPid(pid));
                 }
                 const pidGroups = (await Promise.all(discoveries)).map((response) => ({
                     uri: response.data.uri,

package/dist/nodes/common/mobsearch.js

@@ -574,9 +574,13 @@ function getMobsearch(mobiusSrvc, level, listed, opts) {
       .each(function (i) {
         let item = $(this);
         let secondField = item.find(`.${opts.containerSecondFieldName}`).val();
-        tempList[i][Object.keys(tempList[i])[1]] = JSON.parse(
-          JSON.stringify(secondField)
-        );
+        if (secondField) {
+          tempList[i][Object.keys(tempList[i])[1]] = JSON.parse(
+            JSON.stringify(secondField)
+          );
+        } else {
+          tempList[i][Object.keys(tempList[i])[1]] = '';
+        }
       });
     $(`#${opts.containerName}`).editableList('empty');
     for (let i = 0; i < tempList.length; i++) {

package/dist/nodes/mobius-clear-resource.js

@@ -35,6 +35,11 @@ module.exports = function (RED) {
     this.priority = n.priority;
     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',
@@ -43,83 +48,109 @@ module.exports = function (RED) {
       });
 
       node.on('input', function (msg) {
-        let uri = node.resource;
         let pri = parseInt(node.priority);
+
+        let uri = '';
+        if (msg.hasOwnProperty('topic') && uriValidTest.test(msg.topic)) {
+          uri = msg.topic;
+        }
+        if (uriValidTest.test(node.resource)) {
+          uri = node.resource;
+        }
         if (
           msg.hasOwnProperty('topic') &&
-          require('./validateURI')(msg.topic, 5)
+          uriValidTest.test(msg.topic) &&
+          uriValidTest.test(node.resource)
         ) {
-          uri = msg.topic;
+          node.warn('URI defined in config and input topic. Using config URI.');
+        }
+        if (uri === '') {
+          node.status({
+            fill: 'yellow',
+            shape: 'dot',
+            text: 'Error: URI invalid',
+          });
+          node.error('Error: URI invalid');
+          return;
         }
+
         if (msg.hasOwnProperty('priority')) {
           pri = msg.priority;
         }
 
-        if (uri) {
-          node.status({
-            fill: 'green',
-            shape: 'ring',
-            text: 'Busy',
-          });
+        node.status({
+          fill: 'green',
+          shape: 'ring',
+          text: 'Busy',
+        });
 
-          node.serviceConn.clearResourcePriority(uri, pri, (err, response) => {
-            if (err) {
-              node.status({
-                fill: 'yellow',
-                shape: 'dot',
-                text: `Error: ${err.code ? err.code : 'Unknown'}`,
-              });
-              node.error(
-                `Mobius error clearing resource priority: ${
-                  err.code ? err.code : 'Unknown'
-                }, ${err.message ? err.message : ''}`
-              );
-              if (node.detailedOutput === true) {
-                node.send([
-                  null,
-                  null,
-                  null,
-                  {
-                    ...msg,
-                    topic: uri,
-                    payload: { error: true, response: err },
-                  },
-                ]);
-              }
+        node.serviceConn.clearResourcePriority(uri, pri, (err, response) => {
+          if (err) {
+            node.status({
+              fill: 'yellow',
+              shape: 'dot',
+              text: (() => {
+                if (err.response.status === 404) {
+                  return `Error: Resource not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}`;
+                }
+              })(),
+            });
+            node.error(
+              (() => {
+                if (err.response.status === 404) {
+                  return `Error: Resource not found`;
+                } else {
+                  return `Error: ${err.code ? err.code : 'Unknown'}`;
+                }
+              })()
+            );
+            if (node.detailedOutput === true) {
+              node.send([
+                null,
+                null,
+                null,
+                {
+                  ...msg,
+                  topic: uri,
+                  payload: { error: true, response: err },
+                },
+              ]);
+            }
+          } else {
+            node.status({
+              fill: 'green',
+              shape: 'dot',
+              text: JSON.stringify(response.data.pv),
+            });
+            if (node.detailedOutput === true) {
+              node.send([
+                { ...msg, topic: uri, payload: response.data.pv },
+                {
+                  ...msg,
+                  topic: uri,
+                  payload: { pv: response.data.pv, name: response.data.name },
+                },
+                { ...msg, topic: uri, payload: response.data },
+                {
+                  ...msg,
+                  topic: uri,
+                  payload: { error: false, response: response },
+                },
+              ]);
             } else {
-              node.status({
-                fill: 'green',
-                shape: 'dot',
-                text: JSON.stringify(response.data.pv),
-              });
-              if (node.detailedOutput === true) {
-                node.send([
-                  { ...msg, topic: uri, payload: response.data.pv },
-                  {
-                    ...msg,
-                    topic: uri,
-                    payload: { pv: response.data.pv, name: response.data.name },
-                  },
-                  { ...msg, topic: uri, payload: response.data },
-                  {
-                    ...msg,
-                    topic: uri,
-                    payload: { error: false, response: response },
-                  },
-                ]);
-              } else {
-                node.send([
-                  { ...msg, topic: uri, payload: response.data.pv },
-                  {
-                    ...msg,
-                    topic: uri,
-                    payload: { pv: response.data.pv, name: response.data.name },
-                  },
-                ]);
-              }
+              node.send([
+                { ...msg, topic: uri, payload: response.data.pv },
+                {
+                  ...msg,
+                  topic: uri,
+                  payload: { pv: response.data.pv, name: response.data.name },
+                },
+              ]);
             }
-          });
-        }
+          }
+        });
       });
 
       node.serviceConn.register(node);

package/dist/nodes/mobius-discover.html

@@ -24,11 +24,22 @@ 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 discover">
+<script
+  type="text/x-red"
+  data-template-name="mobius discover"
+>
   <div class="form-row">
     <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-uri"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="node-input-uri" style="width:61%;" placeholder="Discovery URI">
+    </div>
+  </div>
+
   <hr>
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
@@ -37,34 +48,47 @@ POSSIBILITY OF SUCH DAMAGE.
 </script>
 
 <script type="text/javascript">
-  RED.nodes.registerType('mobius discover',{
+  RED.nodes.registerType('mobius discover', {
     category: 'mobius',
-    color: "#8abff5",
+    color: '#8abff5',
     defaults: {
-      name: {value: ""},
-      connection: {type: "mobius connection", required: true}
+      name: { value: '' },
+      uri: {
+        value: '',
+        required: false,
+        validate: function (v) {
+          if (v === '') return true;
+          return new RegExp(
+            `^[0-9A-Fa-f]{6}(?:/[0-9A-Fa-f]{3}(?:/[0-9A-Fa-f]{4}(?:/[0-9A-Fa-f]{4})?)?)?$`
+          ).test(v);
+        },
+      },
+      connection: { type: 'mobius connection', required: true },
     },
-    inputs:1,
-    outputs:1,
-    inputLabels: "Trigger discovery",
-    outputLabels: ["Full MOBiUS response"],
-    icon: "mobius.png",
-    align: "left",
-    paletteLabel: "discover",
-    label: function() {
-      if(this.name) {
+    inputs: 1,
+    outputs: 1,
+    inputLabels: 'Trigger discovery',
+    outputLabels: ['Full MOBiUS response'],
+    icon: 'mobius.png',
+    align: 'left',
+    paletteLabel: 'discover',
+    label: function () {
+      if (this.name) {
         return this.name;
       } else {
-        return "discover";
+        return 'discover';
       }
     },
-    labelStyle: function() {
-      return this.name ? "node_label_italic":"";
-    }
+    labelStyle: function () {
+      return this.name ? 'node_label_italic' : '';
+    },
   });
 </script>
 
-<script type="text/x-red" data-help-name="mobius discover">
+<script
+  type="text/x-red"
+  data-help-name="mobius discover"
+>
   <p>Discover MOBiUS services, object profiles, and objects</p>
 
   <h3>Configuration Page</h3>

package/dist/nodes/mobius-discover.js

@@ -31,8 +31,13 @@ module.exports = function (RED) {
   function MobiusDiscoverNode(n) {
     RED.nodes.createNode(this, n);
     this.serviceConn = RED.nodes.getNode(n.connection);
+    this.configUri = n.uri;
     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',
@@ -45,6 +50,9 @@ module.exports = function (RED) {
         if (msg.hasOwnProperty('topic')) {
           path = msg.topic;
         }
+        if (uriValidTest.test(node.configUri)) {
+          path = node.configUri;
+        }
 
         if (path === '') {
           node.status({

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

@@ -41,6 +41,8 @@ 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}$`);
+
     if (node.serviceConn) {
       node.status({
         fill: 'red',
@@ -49,16 +51,45 @@ module.exports = function (RED) {
       });
 
       node.on('input', function (msg) {
-        let uri = node.service;
+        // check pids of is array of 4char hex strings
+        if (!checkPidsValid(node.pids)) {
+          node.status({
+            fill: 'yellow',
+            shape: 'dot',
+            text: 'Error: PIDs invalid',
+          });
+          node.error('Error: PIDs list invalid');
+          return;
+        }
+
         let pids = JSON.parse(node.pids);
         let rid = node.rid;
         let limit = node.limit;
         let func = node.func;
+        let uri = '';
+        if (msg.hasOwnProperty('topic') && uriValidTest.test(msg.topic)) {
+          uri = msg.topic;
+        }
+        if (uriValidTest.test(node.service)) {
+          uri = node.service;
+        }
         if (
           msg.hasOwnProperty('topic') &&
-          require('./validateURI')(msg.topic, 2)
+          uriValidTest.test(msg.topic) &&
+          uriValidTest.test(node.service)
         ) {
-          uri = msg.topic;
+          node.warn(
+            'Service URI defined in config and input topic. Using config Service URI.'
+          );
+        }
+        if (uri === '') {
+          node.status({
+            fill: 'yellow',
+            shape: 'dot',
+            text: 'Error: URI invalid',
+          });
+          node.error('Error: URI invalid');
+          return;
         }
         if (msg.hasOwnProperty('payload')) {
           if (msg.payload.hasOwnProperty('pids')) {
@@ -144,3 +175,20 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('mobius filter by rid value', MobiusFilterNode);
 };
+
+const checkPidsValid = (pids) => {
+  try {
+    pids = JSON.parse(pids);
+  } catch {
+    return false;
+  }
+  if (!Array.isArray(pids) || pids.length === 0) {
+    return false;
+  }
+  for (let i = 0; i < pids.length; i++) {
+    if (!/^[0-9A-Fa-f]{4}$/.test(pids[i])) {
+      return false;
+    }
+  }
+  return true;
+};

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

@@ -30,24 +30,46 @@
 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);
     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',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       for (const subscription of node.subscriptions) {
-        if (subscription.type === 'include' && validateSubscription(subscription.uri)) {
-          node.serviceConn.subscribeToObjectCOV(subscription.uri, this.id, (response) => {
-            handleSubscription(node, response);
+        if (!uriValidTest.test(subscription.uri)) {
+          node.status({
+            fill: 'yellow',
+            shape: 'dot',
+            text: 'Error: URIs not Valid',
           });
+          return;
+        }
+      }
+
+      for (const subscription of node.subscriptions) {
+        if (
+          subscription.type === 'include' &&
+          validateSubscription(subscription.uri)
+        ) {
+          node.serviceConn.subscribeToObjectCOV(
+            subscription.uri,
+            this.id,
+            (response) => {
+              handleSubscription(node, response);
+            }
+          );
         }
       }
 
@@ -61,7 +83,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,18 +105,24 @@ 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)) {
@@ -106,7 +134,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 {