node-red-contrib-mobius-flow-base 2.5.90 → 3.0.0-beta.12

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

@@ -30,7 +30,7 @@
 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;
@@ -42,7 +42,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -54,32 +54,35 @@ 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.data.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: response.data },
+                { topic: uri, payload: { error: false, response: response } },
               ]);
             } else {
               node.send({ topic: uri, payload: allResources });

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

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusGetResourceNode (n) {
+  function MobiusGetResourceNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.resource = n.resource;
@@ -39,7 +39,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -51,36 +51,41 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy'
+          text: 'Busy',
         });
         node.serviceConn.readResource(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 resource ' + 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.data.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: response.data.pv },
+                { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
+                { topic: uri, payload: response.data },
+                { 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: response.data.pv },
+                { topic: uri, payload: { pv: response.data.pv, name: response.data.name } },
               ]);
             }
           }

package/dist/nodes/mobius-object-cov.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-object"><i class="fa fa-tasks"></i> URI</label>
-    <input type="text" id="node-input-object" placeholder="Object URI (hid/sid/pid/ins)">
+
+  <hr>
+
+  <div id="instance-row">
+    <div class="form-row" id="input-row">
+      <label for="node-input-object"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" id="node-input-object" style="width:61%;" placeholder="Object URI (hid/sid/pid/ins)">
+    </div>
   </div>
+
+  <div id="mobsearch"></div>
+
   <div class="form-row">
     <label for="node-input-include"><i class="fa fa-bars"></i> Include</label>
     <select type="text" id="node-input-include" style="display: inline-block; width: auto; vertical-align: center;">
@@ -40,6 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="changed">Changed Resources</option>
     </select>
   </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;">
@@ -47,6 +56,7 @@ 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;">
@@ -59,6 +69,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius object cov', {
     category: 'mobius',
@@ -100,6 +112,18 @@ 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-object',
+        inputRowId: 'input-row',
+      };
+      initMobsearch.toIns(mobiusSrvc, opts);
+    },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {
         this.outputs = 3;

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

@@ -29,7 +29,7 @@
 var _ = require('lodash');
 
 module.exports = function (RED) {
-  function MobiusObjectCovNode (n) {
+  function MobiusObjectCovNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.object = n.object;
@@ -42,26 +42,29 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.serviceConn.subscribeToObjectCOV(node.object, this.id, (response) => {
         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.include === 'changed') {
           allResources = _.pickBy(allResources, (res) => {
-            return response.changed.includes(res.rid);
+            return response.additonalInformation.changed.includes(res.rid);
           });
         }
         if (node.detailedOutput === true) {
           node.send([
             { topic: response.uri, payload: allResources },
             { 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: allResources });

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

@@ -29,10 +29,17 @@ 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" placeholder="Resource URI (hid/sid/pid/ins/rid)">
+    </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,6 +52,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius resource cov', {
     category: 'mobius',
@@ -84,6 +93,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-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 } },
           ]);
         }
       });

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-mobject"><i class="fa fa-tasks"></i> URI</label>
+      <input type="text" style="width:61%;" id="node-input-mobject" placeholder="Object URI (hid/sid/pid/ins)">
+      
+    </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,6 +53,8 @@ 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',
@@ -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-mobject',
+        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,7 +28,7 @@
 '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;
@@ -39,7 +39,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -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: response.data },
+                  { topic: uri, payload: { error: false, response: response } },
                 ]);
               } else {
-                node.send([
-                  { topic: uri, payload: response.value }
-                ]);
+                node.send([{ topic: uri, payload: response.data }]);
               }
             }
           });

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="Resource URI (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/package.json

@@ -1,12 +1,12 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.90",
+  "version": "3.0.0-beta.12",
   "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": "tsc && 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/mobsearch.js dist/nodes/common/ && cp src/node-red-ui-funcs.js dist/"
   },
   "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
   "node-red": {
@@ -39,12 +39,18 @@
   "license": "Commercial",
   "homepage": "https://bitbucket.org/interiorautomation/node-red-contrib-mobius-flow-base#readme",
   "dependencies": {
-    "@ia/mobius-tcpip-service-api": "^2.0.0",
-    "lodash": "^4.17.11"
+    "axios": "^1.4.0",
+    "https": "^1.0.0",
+    "lodash": "^4.17.11",
+    "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@ia/eslint-config-ia": "^1.0.2",
-    "@types/node": "^11.12.2",
-    "typescript": "^3.4.1"
+    "@types/node": "^18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.56.0",
+    "@typescript-eslint/parser": "^5.56.0",
+    "eslint-config-prettier": "^8.8.0",
+    "prettier": "^2.8.7",
+    "prettier-eslint": "^15.0.1",
+    "typescript": "^4.9.4"
   }
 }