@halsystems/red-bacnet 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.4.1]
+### Changed
+- `discover_point` allows device id to be null, to discover based on IP configuration
+
+## [1.4.0]
+### Changed
+- `read_point` readMethod removed `Read Multiple Fallback Single` option
+
+### Fixed
+- Fixed dummy event emitter not catching output and error
+- Fixed read point event emitter not catching error
+
 ## [1.3.0]
 ### Added
 - WritePoint added concurrentTaskDelay config to control delay between concurrent tasks

package/common/bacnet.js

@@ -6,7 +6,7 @@ const EventEmitter = require('events');
 const bacnet = require('@root/ext/node-bacstack/dist/index.js')
 const baEnum = bacnet.enum;
 
-const { EVENT_ERROR } = require('@root/common/core/constant.js')
+const { EVENT_ERROR, EVENT_OUTPUT } = require('@root/common/core/constant.js')
 const { concurrentTasks } = require('@root/common/core/concurrent.js')
 const { getErrMsg } = require('@root/common/func.js')
 
@@ -266,6 +266,9 @@ module.exports = {
             let failedCount = 0
             let result_single = []
             const dummyEventEmitter = new EventEmitter();
+            dummyEventEmitter.on(EVENT_OUTPUT, () => { });
+            dummyEventEmitter.on(EVENT_ERROR, () => { });
+
             const tasks = reqArr.slice(reqArrIndexNext).flatMap((req, x) =>
                 req.properties.map((prop, y) => ({
                     id: `${x}-${y}`,

package/common/job/discover_point.js

@@ -100,6 +100,10 @@ module.exports = {
                             device,
                             { stripUnknown: true }
                         );
+                        // if device id is null, set to 4194303
+                        if (result.deviceId == null)
+                            result.deviceId = 4194303;
+
                         if (error) {
                             this.eventEmitter.emit(EVENT_ERROR, errMsg(
                                 this.name, ERR_SCHEMA_VALIDATION, error

package/common/job/read_point.js

@@ -223,6 +223,10 @@ module.exports = {
                 count++;
             });
 
+            smartReadEvent.on(EVENT_ERROR, (data) => {
+                this.eventEmitter.emit(EVENT_ERROR, data)
+            });
+
             const tasks = entries
                 .filter(([_, v]) => Array.isArray(v.points) && v.points.length > 0)  // eslint-disable-line
                 .map(([k, v]) => ({

package/common/schema.js

@@ -6,7 +6,7 @@ const Joi = require('joi');
 module.exports = {
     bacnetDeviceSchema: Joi.object({
         deviceName: Joi.string().allow('').default(''),
-        deviceId: Joi.number().min(0).max(4194302).required(),
+        deviceId: Joi.number().min(0).max(4194303).allow(null).required(),
         network: Joi.number().min(0).max(65534).allow(null).default(null),
         ipAddress: Joi.string().required().custom((value, helpers) => {
             const [ip, port] = value.split(':');

package/package.json

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

package/red-bacnet/read_point.html

@@ -33,8 +33,7 @@
         <label for="node-input-readMethod"><i class="fa fa-list"></i> Read Method</label>
         <select id="node-input-readMethod">
             <option value="0">Read Single Only</option>
-            <option value="1">Read Multiple Fallback Single</option>
-            <option value="2">Comprehensive Read</option>
+            <option value="1">Comprehensive Read</option>
         </select>
     </div>
     <div class="form-row">
@@ -62,8 +61,7 @@
 
             <dt>readMethod<span class="property-type">number</span></dt>
             <dd> <b>Read Single Only</b>: use <code>readProperty</code></dd>
-            <dd> <b>Read Multiple Fallback Single</b>: try <code>readPropertyMultiple</code> with consevative query size, fallback to <code>readProperty</code> if failed</dd>
-            <dd> <b>Comprehensive Read</b>: try <code>readPropertyMultiple</code> twice with high and conservative query size,fallback to <code>readProperty</code> if failed</dd>
+            <dd> <b>Comprehensive Read</b>: try <code>readPropertyMultiple</code>, reduce query size if failed, and fallback to <code>readProperty</code> if query size reduced to 1</dd>
 
             <dt>maxConcurrentDeviceRead<span class="property-type">number</span></dt>
             <dd> Devices count to discover simultaneously.</dd>