node-red-contrib-lorawan-bacnet-server 1.2.2 → 1.2.3

package/nodes/bacnet-server/bacnet-server.js

@@ -168,22 +168,22 @@ module.exports = function (RED) {
                     node.vendorId
                 );
 
-                node.debug(`Responded to Who-Is from ${data.address}`);
+                node.debug(`Responded to Who-Is from ${data.header?.sender?.address || 'broadcast'}`);
             }
         };
 
         // Handle Read Property requests
         node.handleReadProperty = function (data) {
-            const objectId = data.request.objectId;
-            const propertyId = data.request.property.id;
-            const arrayIndex = data.request.property.index;
+            const objectId = data.payload.objectId;
+            const propertyId = data.payload.property.id;
+            const arrayIndex = data.payload.property.index;
 
             try {
                 const value = node.getPropertyValue(objectId, propertyId, arrayIndex);
 
                 if (value !== null && value !== undefined) {
                     node.client.readPropertyResponse(
-                        data.address,
+                        data.header.sender,
                         data.invokeId,
                         objectId,
                         { id: propertyId, index: arrayIndex },
@@ -197,7 +197,7 @@ module.exports = function (RED) {
                     }
                 } else {
                     node.client.errorResponse(
-                        data.address,
+                        data.header.sender,
                         bacnet.enum.ConfirmedService.READ_PROPERTY,
                         data.invokeId,
                         bacnet.enum.ErrorClass.PROPERTY,
@@ -207,7 +207,7 @@ module.exports = function (RED) {
             } catch (err) {
                 node.error(`Read Property error: ${err.message}`);
                 node.client.errorResponse(
-                    data.address,
+                    data.header.sender,
                     bacnet.enum.ConfirmedService.READ_PROPERTY,
                     data.invokeId,
                     bacnet.enum.ErrorClass.OBJECT,
@@ -218,17 +218,17 @@ module.exports = function (RED) {
 
         // Handle Write Property requests
         node.handleWriteProperty = function (data) {
-            const objectId = data.request.objectId;
-            const propertyId = data.request.property.id;
-            const priority = data.request.priority || 16;
-            const value = data.request.value;
+            const objectId = data.payload.objectId;
+            const propertyId = data.payload.property.id;
+            const priority = data.payload.priority || 16;
+            const value = data.payload.value;
 
             try {
                 const result = node.setPropertyValue(objectId, propertyId, value, priority);
 
                 if (result.success) {
                     node.client.simpleAckResponse(
-                        data.address,
+                        data.header.sender,
                         bacnet.enum.ConfirmedService.WRITE_PROPERTY,
                         data.invokeId
                     );
@@ -236,14 +236,14 @@ module.exports = function (RED) {
                     // Notify point node
                     const pointNode = node.getPointNode(objectId);
                     if (pointNode) {
-                        pointNode.emitWriteEvent(result.value, priority, data.address);
+                        pointNode.emitWriteEvent(result.value, priority, data.header.sender.address);
                     }
 
                     // Check COV notifications
                     node.checkCovNotifications(objectId);
                 } else {
                     node.client.errorResponse(
-                        data.address,
+                        data.header.sender,
                         bacnet.enum.ConfirmedService.WRITE_PROPERTY,
                         data.invokeId,
                         bacnet.enum.ErrorClass.PROPERTY,
@@ -253,7 +253,7 @@ module.exports = function (RED) {
             } catch (err) {
                 node.error(`Write Property error: ${err.message}`);
                 node.client.errorResponse(
-                    data.address,
+                    data.header.sender,
                     bacnet.enum.ConfirmedService.WRITE_PROPERTY,
                     data.invokeId,
                     bacnet.enum.ErrorClass.OBJECT,
@@ -264,7 +264,7 @@ module.exports = function (RED) {
 
         // Handle Read Property Multiple requests
         node.handleReadPropertyMultiple = function (data) {
-            const properties = data.request.properties;
+            const properties = data.payload.properties;
             const results = [];
 
             for (const prop of properties) {
@@ -310,7 +310,7 @@ module.exports = function (RED) {
             }
 
             node.client.readPropertyMultipleResponse(
-                data.address,
+                data.header.sender,
                 data.invokeId,
                 results
             );
@@ -318,17 +318,17 @@ module.exports = function (RED) {
 
         // Handle Subscribe COV requests
         node.handleSubscribeCov = function (data) {
-            const subscriberProcessId = data.request.subscriberProcessId;
-            const objectId = data.request.monitoredObjectId;
-            const issueConfirmedNotifications = data.request.issueConfirmedNotifications;
-            const lifetime = data.request.lifetime || 0;
+            const subscriberProcessId = data.payload.subscriberProcessId;
+            const objectId = data.payload.monitoredObjectId;
+            const issueConfirmedNotifications = data.payload.issueConfirmedNotifications;
+            const lifetime = data.payload.lifetime || 0;
 
             const objectKey = `${objectId.type}:${objectId.instance}`;
             const obj = node.objects.get(objectKey);
 
             if (!obj) {
                 node.client.errorResponse(
-                    data.address,
+                    data.header.sender,
                     bacnet.enum.ConfirmedService.SUBSCRIBE_COV,
                     data.invokeId,
                     bacnet.enum.ErrorClass.OBJECT,
@@ -337,16 +337,17 @@ module.exports = function (RED) {
                 return;
             }
 
-            const subscriptionKey = `${data.address}:${subscriberProcessId}:${objectKey}`;
+            const senderAddress = data.header?.sender?.address || 'unknown';
+            const subscriptionKey = `${senderAddress}:${subscriberProcessId}:${objectKey}`;
 
-            if (lifetime === 0 && data.request.cancellationRequest) {
+            if (lifetime === 0 && data.payload.cancellationRequest) {
                 // Cancel subscription
                 node.covSubscriptions.delete(subscriptionKey);
                 node.debug(`COV subscription cancelled: ${subscriptionKey}`);
             } else {
                 // Create/update subscription
                 node.covSubscriptions.set(subscriptionKey, {
-                    address: data.address,
+                    address: data.header.sender,
                     processId: subscriberProcessId,
                     objectId: objectId,
                     confirmed: issueConfirmedNotifications,
@@ -358,7 +359,7 @@ module.exports = function (RED) {
             }
 
             node.client.simpleAckResponse(
-                data.address,
+                data.header.sender,
                 bacnet.enum.ConfirmedService.SUBSCRIBE_COV,
                 data.invokeId
             );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-lorawan-bacnet-server",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Custom Node-RED nodes to interface LoRaWAN devices with BACnet protocol. ",
   "keywords": [
     "LoRaWAN",