node-red-contrib-mobius-flow-base 3.0.0-rc.5 → 3.0.0-rc.7

package/README.md

@@ -1,19 +1,47 @@
 # node-red-contrib-mobius-flow-base
 
-Copyright 2016 [iaconnects](http://www.iaconnects.co.uk).
+Copyright 2023 [MobiusFlow](https://mobiusflow.com/).
 
-[Node-RED](http://nodered.org) nodes to interact with MOBiUSFlow.
-
-This module currently requires access to the iaconnects private NPM repository.
+[Node-RED](http://nodered.org) nodes to interact with MobiusFlow.
 
 ## Nodes
 
-### Service Config Node
-All nodes require a connection to a MOBiUS hub. The `mobius service` node takes a service ID as a property and creates a shared connection to the hub. All other nodes use this shared connection.
+### Connection Config Node
+All nodes require a connection to a MobiusFlow Engine. The `mobius connection` config nodes connectes to the MobiusFlow Engine API via http / https
 
 ### Set Resource Node
 Sets the value of, or clears, the specified priority of resource.
 
+### Set Multi-Resource Node
+Sets the value of multiple resources on a given object at once
+
+### Send BCMD Node
+Sends a MobiusFlow broadcast command
+
+### Send DCMD Node
+Send a MobiusFlow direct command to a specified MobiusFlow service
+
+### Get Multi-Resource Node
+Get multiple resource at once
+
+### Get Multi-Object Node
+Get mutliple objects at once
+
+### MobiusFlow Inject Node
+Subscribe to change of value on a defined set of objects. Change events injected in MobiusFlow format.
+
+### Filter Object By Rid Value Node
+Return a filtered list of objects based on a defined filtering function and resource.
+
+### Discover Node
+Discover live MobiusFlow: Hubs, Services, Profiles, Objects and Resources
+
+### Discover Object List
+Discover live objects from a pre-defined set of potentially wildcarded URIs
+
+### Change Admin Password
+Change the password of the administator account of the MobiusFlow Engine
+
 ### Get Resource Node
 Reads the current `pv` or present value of a resource.
 
@@ -27,4 +55,5 @@ 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/common/mobsearch.js

@@ -389,20 +389,23 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
     if (listed) {
-      // opts.list[selectionIndex].uri = uri;
-      tempList = JSON.parse(JSON.stringify(opts.list));
-      tempList[selectionIndex].uri = uri;
+      tempList = JSON.parse(JSON.stringify(opts.list)); // Pre List
+      if (tempList.length === selectionIndex) {
+        tempList.push({uri, type: 'unknown'})
+      } else {
+        tempList[selectionIndex].uri = uri;
+      }
       updateList();
-      opts.list = JSON.parse(JSON.stringify(tempList));
+      opts.list = JSON.parse(JSON.stringify(tempList)); // Set log
     } else {
       $(`#${opts.uriFieldName}`).val(uri);
       document.getElementById(opts.uriFieldName).dispatchEvent(new Event('change'));
+      $(`#${opts.searchButtonId}`).removeClass('disabled');
     }
     $('#node-search-accept').css('color', '#CCCCCC');
     readyToAccept = false;
     $('#node-search-return').addClass('disabled');
     $('#node-search-accept').addClass('disabled');
-    $(`#${opts.searchButtonId}`).removeClass('disabled');
     $('#instance-search-row').hide();
     $('#instance-row').show();
   }

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

@@ -66,7 +66,8 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value:""},
       detailedOutput: {value:false},
       resource: {value:"", validate:function(v) {
-        return (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}|(\\#))|#)|#)|#)|#)$`)).test(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}/[0-9A-Fa-f]{2}$`)).test(v);
       }},
       priority: {value:15, type: 'Number', validate:function(v) { return (v > 0 && v < 16) }},
       connection: {type:"mobius connection", required:true},
@@ -106,6 +107,7 @@ POSSIBILITY OF SUCH DAMAGE.
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
         searchButtonId: 'node-lookup-instance',
+        removeWildcards: true,
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },

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

@@ -76,19 +76,8 @@ POSSIBILITY OF SUCH DAMAGE.
       service: {
         value: '',
         validate: function (v) {
-          if (v === '') {
-            return true;
-          }
-          let parts = v.split('/');
-          for (let lp = 0; lp < parts.length; lp++) {
-            if (parts[lp] === null || parts[lp] === '') {
-              return false;
-            }
-          }
-          if (parts.length === 2) {
-            return true;
-          }
-          return false;
+          if (v === '') return true;
+          return (new RegExp(`^[0-9A-Fa-f]{6}/[0-9A-Fa-f]{3}$`)).test(v);
         },
       },
       connection: { type: 'mobius connection', required: true },

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

@@ -74,7 +74,8 @@ POSSIBILITY OF SUCH DAMAGE.
       detailedOutput: {value:false},
       format: {value: "name", required: true},
       mobject: {value: "", validate:function(v) {
-        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);
+        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},
       outputs: {value:1},
@@ -111,6 +112,7 @@ POSSIBILITY OF SUCH DAMAGE.
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-mobject',
         searchButtonId: 'node-lookup-instance',
+        removeWildcards: true,
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },

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

@@ -67,7 +67,8 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value:""},
       detailedOutput: {value:false},
       resource: {value:"", validate:function(v) {
-        return (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}|(\\#))|#)|#)|#)|#)$`)).test(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}/[0-9A-Fa-f]{2}$`)).test(v);
       }},
       connection: {type:"mobius connection", required: true},
       outputs: {value:2},
@@ -104,6 +105,7 @@ POSSIBILITY OF SUCH DAMAGE.
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
         searchButtonId: 'node-lookup-instance',
+        removeWildcards: true,
       };
       initMobsearch.toRid(mobiusSrvc, opts);
 

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

@@ -82,6 +82,7 @@ POSSIBILITY OF SUCH DAMAGE.
       format: {value: "name", required: true},
       include: {value: "changed", required: true},
       object: {value:"", 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},

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

@@ -63,6 +63,7 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value:""},
       detailedOutput: {value:false},
       resource: {value:"", required:true, 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}|(\\+))/([0-9A-Fa-f]{2}|(\\#))|#)|#)|#)|#)$`)).test(v);
       }},
       connection: {type:"mobius connection", required:true},

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

@@ -63,7 +63,8 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value:""},
       detailedOutput: {value:false},
       mobject: {value: "", validate:function(v) {
-        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);
+        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},
       outputs: {value:2},

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

@@ -68,7 +68,8 @@ POSSIBILITY OF SUCH DAMAGE.
       name: {value:""},
       detailedOutput: {value:false},
       resource: {value:"", validate:function(v) {
-        return (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}|(\\#))|#)|#)|#)|#)$`)).test(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}/[0-9A-Fa-f]{2}$`)).test(v);
       }},
       priority: {value:15, type: 'Number', validate:function(v) { return (v > 0 && v < 16) }},
       connection: {type:"mobius connection", required:true},

package/package.json

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