@halsystems/red-bacnet 1.1.3 → 1.1.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.1.4]
+### Change
+- ReadPoint to not add device to task queue if no points attached to device
+
+## [1.1.4]
+### Added
+- DiscoverPoint added new discover mode: Analog and Binary only
+
 ## [1.1.3]
 ### Change
 - ReadPoint and WritePoint input schema to strip unknown properties instead of rejecting them

package/common/job/discover_point.js

@@ -38,6 +38,10 @@ const multiStateObjectTypes = [
 // const scheduleObjectTypes = [
 //     baEnum.ObjectType.SCHEDULE,
 // ];
+const analogBinaryObjectTypes = [
+    ...analogObjectTypes,
+    ...binaryObjectTypes,
+]
 const supportedObjectTypes = [
     ...analogObjectTypes,
     ...binaryObjectTypes,
@@ -189,9 +193,10 @@ module.exports = {
                             .filter(obj => {
                                 if (this.discoverMode == 0) // basic
                                     return obj && supportedObjectTypes.includes(obj.value.type);
-
-                                // all
-                                return obj !== null;
+                                else if (this.discoverMode == 2) // analog and binary
+                                    return obj !== null && analogBinaryObjectTypes.includes(obj.value.type);
+                                else // all
+                                    return obj !== null;
                             });
 
                         return await readPoints(

package/common/job/read_point.js

@@ -211,7 +211,7 @@ module.exports = {
             smartReadEvent.on(EVENT_OUTPUT, (data) => {
                 this.#updateProgress(
                     Math.round((85 / size) * (count + 1) + 10)
-                )
+                );
 
                 if (Array.isArray(data.result))
                     data.result.forEach(i => {
@@ -223,15 +223,17 @@ module.exports = {
                 count++;
             });
 
-            const tasks = entries.map(([k, v]) => ({
-                id: k,
-                task: async () => {
-                    return await smartReadProperty(
-                        this.client, v.device, v.points, this.readMethod,
-                        this.maxConcurrentSinglePointRead, 10, this.concurrentTaskDelay
-                    );
-                }
-            }));
+            const tasks = entries
+                .filter(([_, v]) => Array.isArray(v.points) && v.points.length > 0)  // eslint-disable-line
+                .map(([k, v]) => ({
+                    id: k,
+                    task: async () => {
+                        return await smartReadProperty(
+                            this.client, v.device, v.points, this.readMethod,
+                            this.maxConcurrentSinglePointRead, 10, this.concurrentTaskDelay
+                        );
+                    }
+                }));
 
             await concurrentTasks(smartReadEvent, tasks, this.maxConcurrentDeviceRead);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halsystems/red-bacnet",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "NodeRED BACnet IP client",
   "email": "open_source@halsystems.com.au",
   "repository": {

package/red-bacnet/discover_point.html

@@ -35,6 +35,7 @@
         <select id="node-input-discoverMode">
             <option value="0">Supported Objects Only</option>
             <option value="1">All Objects</option>
+            <option value="2">Analog and Binary Only</option>
         </select>
     </div>
     <div class="form-row">
@@ -69,6 +70,7 @@
         <dt>discoverMode<span class="property-type">number</span></dt>
         <dd> <b>Supported Objects Only</b>: AI, AO, AV, BI, BO, BV, MSI, MSO, MSV</dd>
         <dd> <b>All Objects</b>: All object types</dd>
+        <dd> <b>Analog and Binary Only</b>: AI, AO, AV, BI, BO, BV</dd>
 
         <dt>readMethod<span class="property-type">number</span></dt>
         <dd> <b>Read Single Only</b>: use <code>readProperty</code></dd>