@bitpoolos/edge-bacnet 1.6.4 → 1.6.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.6.5] - 09-10-2025
+
+Bug fix:
+
+- Specific users found issues of spiking values. Results after a read query are now force ordered. An adjustment made to the bacnet stack _getInvokeId function as it was running out of array space to process a high volume of request responses.
+
+
 ## [1.6.4] - 02-09-2025
 
 Minor feature:

package/bacnet_client.js

@@ -827,16 +827,12 @@ class BacnetClient extends EventEmitter {
       };
 
       // Process the results of the batch
-      results.value.values.forEach((pointResult) => {
-        const cacheRef = requestArray.find(
-          (ele) =>
-            ele.pointRef.meta.objectId.type === pointResult.objectId.type &&
-            ele.pointRef.meta.objectId.instance === pointResult.objectId.instance
-        );
+      results.value.values.forEach((pointResult, index) => {
+        const cacheRef = requestArray[index];
+        const pointRef = cacheRef.pointRef;
+        const pointNameRef = cacheRef.pointName;
 
-        if (cacheRef) {
-          const pointRef = cacheRef.pointRef;
-          const pointNameRef = cacheRef.pointName;
+        if (pointResult.values[0].value.length > 0) {
           const val = pointResult.values[0].value[0].value;
 
           if (isNumber(val)) {
@@ -865,13 +861,12 @@ class BacnetClient extends EventEmitter {
               pointRef.status = "online";
             }
           }
-
-          pointRef.meta["device"] = deviceMetaInfo;
-          pointRef.timestamp = Date.now();
-
-          // Store the point data in results
-          bacnetResults[deviceName][pointNameRef] = pointRef;
         }
+        pointRef.meta["device"] = deviceMetaInfo;
+        pointRef.timestamp = Date.now();
+
+        // Store the point data in results
+        bacnetResults[deviceName][pointNameRef] = pointRef;
       });
     } catch (err) {
       that.logOut("Error processing batch:", err);
@@ -1217,6 +1212,32 @@ class BacnetClient extends EventEmitter {
     };
     return new Promise((resolve, reject) => {
       that.client.readPropertyMultiple(addressObject, requestArray, readOptions, (error, value) => {
+        if (value && value.values) {
+          const reorderedValues = requestArray.map((req) => {
+            const foundValue = value.values.find(
+              (val) => val.objectId.type === req.objectId.type && val.objectId.instance === req.objectId.instance
+            );
+            return (
+              foundValue || {
+                objectId: req.objectId,
+                values: [
+                  {
+                    value: [
+                      {
+                        value: {
+                          errorClass: baEnum.ErrorClass.PROPERTY,
+                          errorCode: baEnum.ErrorCode.UNKNOWN_PROPERTY,
+                        },
+                      },
+                    ],
+                  },
+                ],
+              }
+            );
+          });
+          value.values = reorderedValues;
+        }
+
         resolve({
           error: error,
           value: value,

package/bacnet_gateway.js

@@ -212,14 +212,10 @@ module.exports = function (RED) {
       }
     }
 
-    if (
-      node.bacnetServerEnabled == true &&
-      node.bacnetClient &&
-      node.bacnetServer
-    ) {
+    if (node.bacnetServerEnabled == true && node.bacnetClient && node.bacnetServer) {
       try {
         // Clean up any existing listeners to prevent stale references
-        node.bacnetServer.removeAllListeners('writeProperty');
+        node.bacnetServer.removeAllListeners("writeProperty");
 
         // Store the event handler function so we can clean it up later
         node.writePropertyHandler = (topic, newValue) => {
@@ -269,7 +265,7 @@ module.exports = function (RED) {
         } else if (msg.doUpdatePriorityDevices == true && msg.priorityDevices !== null) {
           node.bacnetClient
             .updatePriorityQueue(msg.priorityDevices)
-            .then(function (result) { })
+            .then(function (result) {})
             .catch(function (error) {
               logOut("Error updating priorityQueue: ", error);
             });
@@ -283,7 +279,7 @@ module.exports = function (RED) {
 
           node.bacnetClient
             .applyDisplayNames(msg.pointsToRead)
-            .then(function (result) { })
+            .then(function (result) {})
             .catch(function (error) {
               logOut("Error in applyDisplayNames: ", error);
             });
@@ -306,7 +302,7 @@ module.exports = function (RED) {
       node.on("close", function () {
         // Clean up the writeProperty event listener
         if (node.bacnetServer && node.writePropertyHandler) {
-          node.bacnetServer.removeListener('writeProperty', node.writePropertyHandler);
+          node.bacnetServer.removeListener("writeProperty", node.writePropertyHandler);
           node.writePropertyHandler = null;
         }
 
@@ -794,7 +790,6 @@ module.exports = function (RED) {
             if (points[point] && "presentValue" in points[point]) {
               let pointName = getPointName(points[point], point);
               let topic = getTopicString("sendSimpleWithStatus", useDeviceName, readNodeName, device, pointName);
-
               msgg.topic = topic;
               let payload = {
                 presentValue: points[point]["presentValue"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
@@ -54,4 +54,4 @@
     "type": "github",
     "url": "git+https://github.com/bitpool/edge-bacnet.git"
   }
-}
+}

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

@@ -67,9 +67,23 @@ class Client extends events_1.EventEmitter {
     }
     // Helper utils
     _getInvokeId() {
+        // Try up to 256 times to find an unused invoke ID
+        for (let attempts = 0; attempts < 256; attempts++) {
+            const id = this._invokeCounter++;
+            if (id >= 256) this._invokeCounter = 1;
+
+            const invokeId = id - 1;
+
+            // If this invoke ID is not currently in use, return it
+            if (!this._invokeStore[invokeId]) {
+                return invokeId;
+            }
+        }
+
+        // Edge case: if all 256 invoke IDs are in use, fall back to original behavior
+        // This prevents infinite loops while maintaining backwards compatibility
         const id = this._invokeCounter++;
-        if (id >= 256)
-            this._invokeCounter = 1;
+        if (id >= 256) this._invokeCounter = 1;
         return id - 1;
     }
     _invokeCallback(id, err, result) {