@bitpoolos/edge-bacnet 1.6.8 → 1.6.9

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.6.9] - 01-07-2026
+
+Bug fix:
+
+- Recover missing points during discovery on small MSTP devices (e.g. RC FlexOne) that reject ReadProperty(ALL). When the "read all" attempt fails, discovery now tries a single targeted ReadPropertyMultiple for the required properties before falling back to per-property reads. This avoids the request storm that could cause the device to reject reads and silently drop Analog/Binary Output points from the model.
+
+- Fixed object-type whitelist filter leaking non-whitelisted objects (e.g. trend-logs) into the model. A malformed object-list entry could throw and abort the filter, leaving the point list unfiltered. The filter is now null-safe, so it always applies and only whitelisted object types are kept.
+
+- Added a discovery log when an object is dropped because no OBJECT_NAME was returned (read likely rejected), to aid diagnosis.
+
 ## [1.6.8] - 10-03-2026
 
 Bug fix: 

package/bacnet_client.js

@@ -1521,6 +1521,26 @@ class BacnetClient extends EventEmitter {
         .catch(reject);
     };
 
+    // Targeted middle tier: request the needed properties in ONE ReadPropertyMultiple.
+    // Used when ALL is rejected (e.g. RC FlexOne / small MSTP that don't support reading
+    // the ALL pseudo-property). Same property set as the per-property fallback, so stored
+    // data is identical - just one request instead of ~12. Falls through to the
+    // per-property reads only if this targeted read also fails.
+    const readTargetedMultiple = (resolve, reject) => {
+      that
+        ._readObject(addressObject, type, instance, propertiesToRead, readOptions)
+        .then((result) => {
+          if (result.value) {
+            resolve(result);
+          } else {
+            readPropertiesIndividually(resolve, reject);
+          }
+        })
+        .catch(() => {
+          readPropertiesIndividually(resolve, reject);
+        });
+    };
+
     return new Promise((resolve, reject) => {
       // For Device objects (type 8), skip ALL attempt - many MSTP devices don't support it
       // Go straight to reading individual properties for better reliability
@@ -1537,13 +1557,15 @@ class BacnetClient extends EventEmitter {
             // If the result has value, resolve the promise
             resolve(result);
           } else {
-            // If not, proceed to read individual properties
-            readPropertiesIndividually(resolve, reject);
+            // ALL returned no value - try the targeted multi-property RPM before
+            // falling back to the per-property storm.
+            readTargetedMultiple(resolve, reject);
           }
         })
         .catch(() => {
-          // On error, proceed to read individual properties
-          readPropertiesIndividually(resolve, reject);
+          // ALL errored - try the targeted multi-property RPM before falling back
+          // to the per-property storm.
+          readTargetedMultiple(resolve, reject);
         });
     });
   }
@@ -2237,6 +2259,12 @@ class BacnetClient extends EventEmitter {
                   that.logOut("issue resolving bacnet payload, see error:  ", e);
                   reject(e);
                 }
+              } else {
+                that.logOut(
+                  "[discovery] dropped " + bac_obj + ":" + pointProperty.objectId.instance +
+                  " on device " + device.getDeviceId() +
+                  " - no OBJECT_NAME returned (read likely rejected)"
+                );
               }
             });
           } else {

package/bacnet_device.js

@@ -268,10 +268,20 @@ class BacnetDevice {
     }
 
     setPointsList(newPoints) {
+        // Whitelisted object types kept in the model:
+        // DEVICE(8) AI(0) AO(1) AV(2) BI(3) BO(4) BV(5) MSI(13) MSO(14) MSV(19) CS(40)
+        const allowedTypes = new Set([8, 0, 1, 2, 3, 4, 5, 13, 14, 19, 40]);
+
         for (let index = 0; index < newPoints.length; index++) {
             let newPoint = newPoints[index];
-            if (newPoint) {
-                let foundIndex = this.pointsList.findIndex(ele => ele.value.type == newPoint.value.type && ele.value.instance == newPoint.value.instance);
+            // Guard against malformed entries (e.g. a bad object-list read with no .value):
+            // skip them here so they never enter pointsList and can't throw the dedup below.
+            if (newPoint && newPoint.value && newPoint.value.type !== undefined) {
+                let foundIndex = this.pointsList.findIndex(
+                    ele => ele && ele.value &&
+                           ele.value.type == newPoint.value.type &&
+                           ele.value.instance == newPoint.value.instance
+                );
                 if (foundIndex == -1) {
                     //not found
                     this.pointsList.push(newPoint);
@@ -279,19 +289,10 @@ class BacnetDevice {
             }
         }
 
-        this.pointsList = this.pointsList.filter((point) =>
-            point.value.type == 8 ||  //DEVICE
-            point.value.type == 0 ||  //AI
-            point.value.type == 1 ||  //AV
-            point.value.type == 2 ||  //AO
-            point.value.type == 3 ||  //BI
-            point.value.type == 4 ||  //BV
-            point.value.type == 5 ||  //BO
-            point.value.type == 13 || //MSI
-            point.value.type == 14 || //MSO
-            point.value.type == 19 || //MSV
-            point.value.type == 40    //CS 
-        );
+        // Optional chaining so a malformed element is EXCLUDED (allowedTypes.has(undefined) === false)
+        // instead of throwing and aborting the filter, which previously left pointsList unfiltered
+        // and leaked non-whitelisted types (trend-logs etc.) into the model.
+        this.pointsList = this.pointsList.filter(point => allowedTypes.has(point?.value?.type));
     }
 
     getDevicePoints() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,41 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System Information (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 1.2]
- - Node-RED version: 
- - NodeJS version: 
-
-**Are you running Node-RED in a docker container or directly on the operating system or virtual machine?**
-
-
-
-**Please provide a dump of the Node-RED error log with the Error logging and Device Found check box options enabled (found in _gateway_ node - _Discovery_ tab) if applicable:**
- 
-
-
-**Additional context**
-Add any other context about the problem here.

package/resources/node-bacstack-ts/dist/index.js

@@ -1,3 +0,0 @@
-'use strict';
-module.exports = require('./lib/client');
-module.exports.enum = require('./lib/enum');

package/resources/node-bacstack-ts/dist/lib/apdu.js

@@ -1,193 +0,0 @@
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeAbort = exports.encodeAbort = exports.decodeError = exports.encodeError = exports.decodeSegmentAck = exports.encodeSegmentAck = exports.decodeComplexAck = exports.encodeComplexAck = exports.decodeSimpleAck = exports.encodeSimpleAck = exports.decodeUnconfirmedServiceRequest = exports.encodeUnconfirmedServiceRequest = exports.decodeConfirmedServiceRequest = exports.encodeConfirmedServiceRequest = exports.getDecodedInvokeId = exports.setDecodedType = exports.getDecodedType = void 0;
-const baEnum = require("./enum");
-const getDecodedType = (buffer, offset) => {
-    return buffer[offset];
-};
-exports.getDecodedType = getDecodedType;
-const setDecodedType = (buffer, offset, type) => {
-    buffer[offset] = type;
-};
-exports.setDecodedType = setDecodedType;
-const getDecodedInvokeId = (buffer, offset) => {
-    const type = (0, exports.getDecodedType)(buffer, offset);
-    switch (type & baEnum.PDU_TYPE_MASK) {
-        case baEnum.PduTypes.SIMPLE_ACK:
-        case baEnum.PduTypes.COMPLEX_ACK:
-        case baEnum.PduTypes.ERROR:
-        case baEnum.PduTypes.REJECT:
-        case baEnum.PduTypes.ABORT:
-            return buffer[offset + 1];
-        case baEnum.PduTypes.CONFIRMED_REQUEST:
-            return buffer[offset + 2];
-        default:
-            return;
-    }
-};
-exports.getDecodedInvokeId = getDecodedInvokeId;
-const encodeConfirmedServiceRequest = (buffer, type, service, maxSegments, maxApdu, invokeId, sequencenumber, proposedWindowSize) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = maxSegments | maxApdu;
-    buffer.buffer[buffer.offset++] = invokeId;
-    if ((type & baEnum.PduConReqBits.SEGMENTED_MESSAGE) > 0) {
-        buffer.buffer[buffer.offset++] = sequencenumber;
-        buffer.buffer[buffer.offset++] = proposedWindowSize;
-    }
-    buffer.buffer[buffer.offset++] = service;
-};
-exports.encodeConfirmedServiceRequest = encodeConfirmedServiceRequest;
-const decodeConfirmedServiceRequest = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const maxSegments = buffer[offset] & 0xF0;
-    const maxApdu = buffer[offset++] & 0x0F;
-    const invokeId = buffer[offset++];
-    let sequencenumber = 0;
-    let proposedWindowNumber = 0;
-    if ((type & baEnum.PduConReqBits.SEGMENTED_MESSAGE) > 0) {
-        sequencenumber = buffer[offset++];
-        proposedWindowNumber = buffer[offset++];
-    }
-    const service = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        service: service,
-        maxSegments: maxSegments,
-        maxApdu: maxApdu,
-        invokeId: invokeId,
-        sequencenumber: sequencenumber,
-        proposedWindowNumber: proposedWindowNumber
-    };
-};
-exports.decodeConfirmedServiceRequest = decodeConfirmedServiceRequest;
-const encodeUnconfirmedServiceRequest = (buffer, type, service) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = service;
-};
-exports.encodeUnconfirmedServiceRequest = encodeUnconfirmedServiceRequest;
-const decodeUnconfirmedServiceRequest = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const service = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        service: service
-    };
-};
-exports.decodeUnconfirmedServiceRequest = decodeUnconfirmedServiceRequest;
-const encodeSimpleAck = (buffer, type, service, invokeId) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = invokeId;
-    buffer.buffer[buffer.offset++] = service;
-};
-exports.encodeSimpleAck = encodeSimpleAck;
-const decodeSimpleAck = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const invokeId = buffer[offset++];
-    const service = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        service: service,
-        invokeId: invokeId
-    };
-};
-exports.decodeSimpleAck = decodeSimpleAck;
-const encodeComplexAck = (buffer, type, service, invokeId, sequencenumber, proposedWindowNumber) => {
-    let len = 3;
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = invokeId;
-    if ((type & baEnum.PduConReqBits.SEGMENTED_MESSAGE) > 0) {
-        buffer.buffer[buffer.offset++] = sequencenumber;
-        buffer.buffer[buffer.offset++] = proposedWindowNumber;
-        len += 2;
-    }
-    buffer.buffer[buffer.offset++] = service;
-    return len;
-};
-exports.encodeComplexAck = encodeComplexAck;
-const decodeComplexAck = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const invokeId = buffer[offset++];
-    let sequencenumber = 0;
-    let proposedWindowNumber = 0;
-    if ((type & baEnum.PduConReqBits.SEGMENTED_MESSAGE) > 0) {
-        sequencenumber = buffer[offset++];
-        proposedWindowNumber = buffer[offset++];
-    }
-    const service = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        service: service,
-        invokeId: invokeId,
-        sequencenumber: sequencenumber,
-        proposedWindowNumber: proposedWindowNumber
-    };
-};
-exports.decodeComplexAck = decodeComplexAck;
-const encodeSegmentAck = (buffer, type, originalInvokeId, sequencenumber, actualWindowSize) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = originalInvokeId;
-    buffer.buffer[buffer.offset++] = sequencenumber;
-    buffer.buffer[buffer.offset++] = actualWindowSize;
-};
-exports.encodeSegmentAck = encodeSegmentAck;
-const decodeSegmentAck = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const originalInvokeId = buffer[offset++];
-    const sequencenumber = buffer[offset++];
-    const actualWindowSize = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        originalInvokeId: originalInvokeId,
-        sequencenumber: sequencenumber,
-        actualWindowSize: actualWindowSize
-    };
-};
-exports.decodeSegmentAck = decodeSegmentAck;
-const encodeError = (buffer, type, service, invokeId) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = invokeId;
-    buffer.buffer[buffer.offset++] = service;
-};
-exports.encodeError = encodeError;
-const decodeError = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const invokeId = buffer[offset++];
-    const service = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        service: service,
-        invokeId: invokeId
-    };
-};
-exports.decodeError = decodeError;
-const encodeAbort = (buffer, type, invokeId, reason) => {
-    buffer.buffer[buffer.offset++] = type;
-    buffer.buffer[buffer.offset++] = invokeId;
-    buffer.buffer[buffer.offset++] = reason;
-};
-exports.encodeAbort = encodeAbort;
-const decodeAbort = (buffer, offset) => {
-    const orgOffset = offset;
-    const type = buffer[offset++];
-    const invokeId = buffer[offset++];
-    const reason = buffer[offset++];
-    return {
-        len: offset - orgOffset,
-        type: type,
-        invokeId: invokeId,
-        reason: reason
-    };
-};
-exports.decodeAbort = decodeAbort;