node-red-contrib-mobius-flow-base 2.5.86-beta.7 → 2.5.86-beta.73

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusResourceCovNode (n) {
+  function MobiusResourceCovNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.resource = n.resource;
@@ -39,26 +39,26 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.serviceConn.subscribeToCOV(node.resource, this.id, (response) => {
         node.status({
           fill: 'green',
           shape: 'dot',
-          text: JSON.stringify(response.value.pv)
+          text: JSON.stringify(response.value.pv),
         });
         if (node.detailedOutput === true) {
           node.send([
             { topic: response.uri, payload: response.value.pv },
             { topic: response.uri, payload: { pv: response.value.pv, name: response.value.name } },
             { topic: response.uri, payload: response.value },
-            { topic: response.uri, payload: { response: response } }
+            { topic: response.uri, payload: { response: response } },
           ]);
         } else {
           node.send([
             { topic: response.uri, payload: response.value.pv },
-            { topic: response.uri, payload: { pv: response.value.pv, name: response.value.name } }
+            { topic: response.uri, payload: { pv: response.value.pv, name: response.value.name } },
           ]);
         }
       });
@@ -74,4 +74,12 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius resource cov', MobiusResourceCovNode);
+
+  RED.httpAdmin.get('/common/*', function (req, res) {
+    var options = {
+      root: __dirname + '/common/',
+      dotfiles: 'deny',
+    };
+    res.sendFile(req.params[0], options);
+  });
 };

package/dist/nodes/mobius-set-multi-resource.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-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)">
+      <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
+    </div>
   </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;">
@@ -45,13 +53,15 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius set multi-resource',{
     category: 'mobius',
     defaults: {
       name: {value:""},
       detailedOutput: {value:false},
-      mobject: {value: "", validate:function(v) {
+      instance: {value: "", validate:function(v) {
         if(v === '') { return true; }
         let parts = v.split('/');
         for(let lp = 0; lp < parts.length; lp++) {
@@ -82,6 +92,17 @@ 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-instance',
+        inputRowId: 'input-row',
+      };
+      initMobsearch.toIns(mobiusSrvc, opts);
+    },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {
         this.outputs = 2;

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

@@ -28,10 +28,10 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusSetMultiResourceNode (n) {
+  function MobiusSetMultiResourceNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
-    this.mobject = n.mobject;
+    this.instance = n.instance;
     this.serviceConn = RED.nodes.getNode(n.connection);
     var node = this;
 
@@ -39,11 +39,11 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
-        let uri = node.mobject;
+        let uri = node.instance;
         let value = null;
         if (msg.hasOwnProperty('topic') && require('./validateURI')(msg.topic, 4)) {
           uri = msg.topic;
@@ -55,7 +55,7 @@ module.exports = function (RED) {
           node.status({
             fill: 'green',
             shape: 'ring',
-            text: 'Busy'
+            text: 'Busy',
           });
 
           node.serviceConn.multiWriteResourceValue(uri, value, (err, response) => {
@@ -63,27 +63,25 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code)
+                text: 'Error: ' + JSON.stringify(err.code),
               });
               node.error('Mobius error writing multiple resources ' + JSON.stringify(err));
               if (node.detailedOutput === true) {
-                node.send([null, {topic: uri, payload: { error: true, response: err }}]);
+                node.send([null, { topic: uri, payload: { error: true, response: err } }]);
               }
             } else {
               node.status({
                 fill: 'green',
                 shape: 'dot',
-                text: 'OK'
+                text: 'OK',
               });
               if (node.detailedOutput === true) {
                 node.send([
                   { 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: response.value }
-                ]);
+                node.send([{ topic: uri, payload: response.value }]);
               }
             }
           });
@@ -101,4 +99,12 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius set multi-resource', MobiusSetMultiResourceNode);
+
+  RED.httpAdmin.get('/common/*', function (req, res) {
+    var options = {
+      root: __dirname + '/common/',
+      dotfiles: 'deny',
+    };
+    res.sendFile(req.params[0], options);
+  });
 };

package/dist/nodes/mobius-set-resource.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-resource"><i class="fa fa-tasks"></i> URI</label>
-    <input type="text" id="node-input-resource" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+
+  <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>
+
+  <div id="mobsearch"></div>
+
   <div class="form-row">
     <label for="node-input-priority"><i class="fa fa-exclamation-triangle"></i> Priority</label>
     <input type="text" id="node-input-priority" placeholder="Priotity to write or clear">
@@ -49,6 +57,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius set resource',{
     category: 'mobius',
@@ -90,6 +100,17 @@ 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;

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusSetResourceNode (n) {
+  function MobiusSetResourceNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.resource = n.resource;
@@ -40,7 +40,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -60,7 +60,7 @@ module.exports = function (RED) {
           node.status({
             fill: 'green',
             shape: 'ring',
-            text: 'Busy'
+            text: 'Busy',
           });
 
           if (value === null) {
@@ -69,29 +69,34 @@ module.exports = function (RED) {
                 node.status({
                   fill: 'yellow',
                   shape: 'dot',
-                  text: 'Error: ' + JSON.stringify(err.code)
+                  text: 'Error: ' + JSON.stringify(err.code),
                 });
                 node.error('Mobius error clearing resource priority ' + JSON.stringify(err));
                 if (node.detailedOutput === true) {
-                  node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
+                  node.send([
+                    null,
+                    null,
+                    null,
+                    { topic: uri, payload: { error: true, response: err } },
+                  ]);
                 }
               } else {
                 node.status({
                   fill: 'green',
                   shape: 'dot',
-                  text: JSON.stringify(response.value.pv)
+                  text: JSON.stringify(response.value.pv),
                 });
                 if (node.detailedOutput === true) {
                   node.send([
                     { topic: uri, payload: response.value.pv },
                     { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                     { 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: response.value.pv },
-                    { topic: uri, payload: { pv: response.value.pv, name: response.value.name } }
+                    { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                   ]);
                 }
               }
@@ -102,27 +107,32 @@ module.exports = function (RED) {
                 node.status({
                   fill: 'yellow',
                   shape: 'dot',
-                  text: 'Error: ' + JSON.stringify(err.code)
+                  text: 'Error: ' + JSON.stringify(err.code),
                 });
                 node.error('Mobius error writing resource ' + JSON.stringify(err));
-                node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
+                node.send([
+                  null,
+                  null,
+                  null,
+                  { topic: uri, payload: { error: true, response: err } },
+                ]);
               } else {
                 node.status({
                   fill: 'green',
                   shape: 'dot',
-                  text: JSON.stringify(response.value.pv)
+                  text: JSON.stringify(response.value.pv),
                 });
                 if (node.detailedOutput === true) {
                   node.send([
                     { topic: uri, payload: response.value.pv },
                     { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                     { 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: response.value.pv },
-                    { topic: uri, payload: { pv: response.value.pv, name: response.value.name } }
+                    { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                   ]);
                 }
               }
@@ -142,4 +152,12 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius set resource', MobiusSetResourceNode);
+
+  RED.httpAdmin.get('/common/*', function (req, res) {
+    var options = {
+      root: __dirname + '/common/',
+      dotfiles: 'deny',
+    };
+    res.sendFile(req.params[0], options);
+  });
 };

package/dist/nodes/node-red-ui-discover-devices.js

@@ -119,41 +119,41 @@ module.exports = {
         let services = [];
         for (let i = 0; i < servicesFromConfig.length; i++) {
           services.push({
-            id: servicesFromConfig.id,
-            spid: servicesFromConfig.id.split('/')[0],
-            sid: servicesFromConfig.id.split('/')[1],
-            uri: `${nodeConfig.uri}/${servicesFromConfig.id.split('/')[1]}`,
-            name: servicesFromConfig.name,
-            enabled: servicesFromConfig.enabled,
-            runAtStart: servicesFromConfig.runAtStart,
+            id: servicesFromConfig[i].id,
+            spid: servicesFromConfig[i].id.split('/')[0],
+            sid: servicesFromConfig[i].id.split('/')[1],
+            uri: `${nodeConfig.uri}/${servicesFromConfig[i].id.split('/')[1]}`,
+            name: servicesFromConfig[i].name,
+            enabled: servicesFromConfig[i].enabled,
+            runAtStart: servicesFromConfig[i].runAtStart,
             registered: null,
             lastConnected: null,
             status: null,
             statusText: null,
             mobiusSettings: null,
             customSettings: null,
+            pids: [],
           });
         }
 
-        console.log('Following get node config');
-        console.log(services);
-
         // Fetch information from each service config
-        for (i = 0; i < services.length; i++) {
+        for (let i = 0; i < services.length; i++) {
           const fullServiceConfig = await connection.getServiceConfigProm(hid, services[i].sid);
-          services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
-          services[i].customSettings = fullServiceConfig.value.serviceConfig.custom;
+          if (fullServiceConfig.value.serviceConfig !== undefined) {
+            services[i].mobiusSettings = fullServiceConfig.value.serviceConfig.settings;
+            services[i].customSettings = fullServiceConfig.value.serviceConfig.custom;
+          } else {
+            services[i].mobiusSettings = fullServiceConfig.value.settings;
+            services[i].customSettings = fullServiceConfig.value.custom;
+          }
         }
 
-        console.log('Following service node configs');
-        console.log(services);
-
         // Fetch information from discovered services
         const discoveryResponse = await this.discover(connection, hid);
         const servicesFromDiscovery = discoveryResponse.value;
-        for (i = 0; i < servicesFromDiscovery.length; i++) {
+        for (let i = 0; i < servicesFromDiscovery.length; i++) {
           let serviceFound = false;
-          for (j = 0; j < services.length; j++) {
+          for (let j = 0; j < services.length; j++) {
             if (servicesFromDiscovery[i].id === services[j].id) {
               serviceFound = true;
               services[j].registered = servicesFromDiscovery[i].registered;
@@ -176,30 +176,57 @@ module.exports = {
               statusText: null,
               mobiusSettings: null,
               customSettings: null,
+              pids: [],
             });
           }
         }
 
-        console.log('Following discover');
-        console.log(services);
-
-        // Fetch status object from all services
-        for (i = 0; i < services.length; i++) {
-          const statusObjectResponse = await this.discover(
-            connection,
-            `${hid}/${services[i].sid}/0001/0001`
-          );
-          const statusObject = statusObjectResponse.value;
-          services[i].status = statusObject.resources[1].pv;
-          services[i].statusText = `${statusObject.resources[2].pv}`;
+        // Fetch pids and status object from all services
+        for (let i = 0; i < services.length; i++) {
+          if (services[i].sid !== '009') {
+            const serviceResponse = await this.discover(connection, `${hid}/${services[i].sid}`);
+            services[i].pids = [...new Set(serviceResponse.value)];
+            const statusObjectResponse = await this.discover(
+              connection,
+              `${hid}/${services[i].sid}/0001/0001`
+            );
+            const statusObject = statusObjectResponse.value[0];
+            services[i].status = statusObject.resources[1].pv;
+            services[i].statusText = `${statusObject.resources[2].pv}`;
+          } else {
+            services[i].pids = [];
+            services[i].status = 'Unknown';
+            services[i].statusText = 'Unknown';
+          }
         }
 
-        console.log('Complete');
-        console.log(services);
-
         resolve(services);
       } catch (err) {
-        reject(err);
+        reject(JSON.stringify(err));
+      }
+    });
+  },
+
+  getObjectList(connection, hid, sid) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let objectList = [];
+        const serviceResponse = await this.discover(connection, `${hid}/${sid}`);
+        const pids = [...new Set(serviceResponse.value)];
+        for (let i = 0; i < pids.length; i++) {
+          const inssResponse = await this.discover(connection, `${hid}/${sid}/${pids[i]}`);
+          const inss = inssResponse.value;
+          for (let j = 0; j < inss.length; j++) {
+            const objResponse = await this.discover(
+              connection,
+              `${hid}/${sid}/${pids[i]}/${inss[j]}`
+            );
+            objectList.push(objResponse.value[0]);
+          }
+        }
+        resolve(objectList);
+      } catch (err) {
+        reject(JSON.stringify(err));
       }
     });
   },

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.86-beta.7",
+  "version": "2.5.86-beta.73",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/"
+    "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/ && mkdir -p dist/nodes/common && cp src/nodes/common/*.js dist/nodes/common/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {