node-red-contrib-mobius-flow-base 2.5.87 → 2.5.88

package/README.md

@@ -1,10 +1,16 @@
 # node-red-contrib-mobius-flow-base
+![Version](https://img.shields.io/badge/Version-v1.0.12-blue.svg)  
 
-Copyright 2016 [iaconnects](http://www.iaconnects.co.uk).
+Copyright 2016 [Interior Automation](http://www.interior-automation.co.uk) under the BSD-3-Clause license.
 
-[Node-RED](http://nodered.org) nodes to interact with MOBiUSFlow.
+[Node-RED](http://nodered.org) nodes to interact with Interior Automation's MOBiUS Flow.
 
-This module currently requires access to the iaconnects private NPM repository.
+## Install
+Run the following command in the root directory of your Node-RED install:
+
+```npm install node-red-contrib-mobius-flow-base```
+
+This module currently requires access to Interior Automation's private NPM repository. This will be made public in the future once MOBiUS Flow is ready for public release.
 
 ## Nodes
 
@@ -27,4 +33,4 @@ Clears the specified priority of resource.
 Subscribe to change of value events for an object
 
 ### Resource COV Node
-Subscribe to change of value events for a resource
+Subscribe to change of value events for a resource

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,27 +134,29 @@ module.exports = function (RED) {
                 pids: pids,
                 rid: node.rid,
                 func: node.func,
-                limit: node.limit
+                limit: node.limit,
               };
             } else {
               discoverParams = {
                 uri: serviceURI,
-                pids: pids,
-                rid: '00',
-                func: 'return true;',
-                limit: 512
+                // pids: pids,
+                // rid: '00',
+                // func: 'return true;',
+                // 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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.87",
+  "version": "2.5.88",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",