@bitpoolos/edge-bacnet 1.3.1 → 1.4.0

package/bacnet_read.html

@@ -20,6 +20,7 @@
             readDevices: { value: [] },
             devicesToRead: [],
             object_property_simplePayload: { value: false },
+            object_property_simpleWithStatus: { value: false },
             object_property_fullObject: { value: true },
         },
         inputs: 1,
@@ -96,9 +97,6 @@
                 mounted() {
                     let app = this;
                     this.getData(true);
-                    if (!node.reloadTimer) {
-                        node.reloadTimer = setInterval(() => app.getData(false), 7000);
-                    }
 
                     $("#readlist-file-upload").on("change", function (event) {
                         const input = event.target.files[0];
@@ -408,29 +406,31 @@
                                     return ele.address == ipAddress && ele.deviceId == deviceId;
                                 }
                             });
-                            const deviceName = device.deviceName;
-                            const points = Object.keys(deviceObject);
-                            for (point in points) {
-                                csvContent +=
-                                    ipAddress +
-                                    "," +
-                                    deviceId +
-                                    "," +
-                                    deviceName +
-                                    "," +
-                                    points[point] +
-                                    "," +
-                                    deviceObject[points[point]].meta.objectId.type +
-                                    "\r\n";
-
-                                if (parseInt(point) == points.length - 1 && parseInt(key) == keys.length - 1) {
-                                    // last iteration
-                                    var encodedUri = encodeURI(csvContent);
-                                    var link = document.createElement("a");
-                                    link.setAttribute("href", encodedUri);
-                                    link.setAttribute("download", "pointslist.csv");
-                                    document.body.appendChild(link);
-                                    link.click();
+                            if (device) {
+                                const deviceName = device.deviceName;
+                                const points = Object.keys(deviceObject);
+                                for (point in points) {
+                                    csvContent +=
+                                        ipAddress +
+                                        "," +
+                                        deviceId +
+                                        "," +
+                                        deviceName +
+                                        "," +
+                                        points[point] +
+                                        "," +
+                                        deviceObject[points[point]].meta.objectId.type +
+                                        "\r\n";
+
+                                    if (parseInt(point) == points.length - 1 && parseInt(key) == keys.length - 1) {
+                                        // last iteration
+                                        var encodedUri = encodeURI(csvContent);
+                                        var link = document.createElement("a");
+                                        link.setAttribute("href", encodedUri);
+                                        link.setAttribute("download", "pointslist.csv");
+                                        document.body.appendChild(link);
+                                        link.click();
+                                    }
                                 }
                             }
                         }
@@ -661,28 +661,22 @@
                             }
 
                             const devicePoints = Object.keys(device);
-                            let pointIndex = 0;
-                            doPoints(pointIndex);
 
-                            function doPoints(pointIndex) {
+                            for (let pointIndex = 0; pointIndex <= devicePoints.length; pointIndex++) {
                                 let pointName = devicePoints[pointIndex];
                                 let pointObject = device[pointName];
 
                                 //formatting json payload, still in progress
 
-                                exportJson[key][pointName] = {
-                                    meta: pointObject.meta,
-                                    objectName: pointObject.objectName,
-                                    displayName: pointObject.displayName,
-                                };
-
-                                // exportJson[key][pointName] = pointObject;
+                                if (pointObject) {
+                                    exportJson[key][pointName] = {
+                                        meta: pointObject.meta,
+                                        objectName: pointObject.objectName,
+                                        displayName: pointObject.displayName,
+                                    };
+                                }
 
-                                if (pointIndex < devicePoints.length - 1) {
-                                    //more points to read for device
-                                    pointIndex++;
-                                    doPoints(pointIndex);
-                                } else if (pointIndex == devicePoints.length - 1) {
+                                if (pointIndex == devicePoints.length - 1) {
                                     //all points have been iterated
 
                                     if (deviceIndex < devicesToExport.length - 1) {
@@ -873,6 +867,8 @@
 
             document.getElementById("node-input-object_property_simplePayload").checked = node.object_property_simplePayload;
             document.getElementById("node-input-object_property_simplePayload").onclick = handleCheckboxClick;
+            document.getElementById("node-input-object_property_simpleWithStatus").checked = node.object_property_simpleWithStatus;
+            document.getElementById("node-input-object_property_simpleWithStatus").onclick = handleCheckboxClick;
             document.getElementById("node-input-object_property_fullObject").checked = node.object_property_fullObject;
             document.getElementById("node-input-object_property_fullObject").onclick = handleCheckboxClick;
 
@@ -894,14 +890,16 @@
 
             function handleCheckboxClick() {
                 if (this.id == "node-input-object_property_simplePayload") {
-                    document.getElementById("node-input-object_property_fullObject").checked = !document.getElementById(
-                        "node-input-object_property_fullObject"
-                    ).checked;
+                    document.getElementById("node-input-object_property_fullObject").checked = false;
+                    document.getElementById("node-input-object_property_simpleWithStatus").checked = false;
+                }
+                if (this.id == "node-input-object_property_simpleWithStatus") {
+                    document.getElementById("node-input-object_property_fullObject").checked = false;
+                    document.getElementById("node-input-object_property_simplePayload").checked = false;
                 }
                 if (this.id == "node-input-object_property_fullObject") {
-                    document.getElementById("node-input-object_property_simplePayload").checked = !document.getElementById(
-                        "node-input-object_property_simplePayload"
-                    ).checked;
+                    document.getElementById("node-input-object_property_simplePayload").checked = false;
+                    document.getElementById("node-input-object_property_simpleWithStatus").checked = false;
                 }
             }
 
@@ -948,25 +946,13 @@
         },
         oneditsave: function () {
             let node = this;
-            if (node.vm.$data.devices) node.devices = node.vm.$data.devices;
             if (node.vm.$data.readDevices) node.readDevices = node.vm.$data.readDevices;
             if (node.vm.$data.pointsToRead) node.pointsToRead = node.vm.$data.pointsToRead;
-            //clear reload data function
-            if (node.reloadTimer) {
-                clearInterval(node.reloadTimer);
-                node.reloadTimer = null;
-            }
         },
         oneditcancel: function () {
             let node = this;
-            if (node.vm.$data.devices) node.devices = node.vm.$data.devices;
             if (node.vm.$data.readDevices) node.readDevices = node.vm.$data.readDevices;
             if (node.vm.$data.pointsToRead) node.pointsToRead = node.vm.$data.pointsToRead;
-            //clear reload data function
-            if (node.reloadTimer) {
-                clearInterval(node.reloadTimer);
-                node.reloadTimer = null;
-            }
         },
     });
 </script>
@@ -1264,6 +1250,21 @@
             </label>
           </div>
 
+          <div class="objectPropertiesLabel">
+            <label
+              for="node-input-object_property_simpleWithStatus"
+              style="padding-left: 4px; width: auto; align-items: start;"
+              class="objectPropertiesLabel">
+              <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_simpleWithStatus"></span>
+              <input
+                style="margin-left: 5px;"
+                class=" objectProp"
+                type="checkbox"
+                id="node-input-object_property_simpleWithStatus" />
+              <a style="white-space: nowrap; padding-left: 20px;">Simple With Status</a>
+            </label>
+          </div>
+
           <div class="objectPropertiesLabel">
             <label
               for="node-input-object_property_fullObject"
@@ -1278,6 +1279,7 @@
               <a style="white-space: nowrap; padding-left: 20px;">Full Object</a>
             </label>
           </div>
+
         </div>
       </div>
 

package/bacnet_read.js

@@ -22,6 +22,7 @@ module.exports = function (RED) {
     this.nodeName = config.name;
 
     this.object_property_simplePayload = config.object_property_simplePayload;
+    this.object_property_simpleWithStatus = config.object_property_simpleWithStatus;
     this.object_property_fullObject = config.object_property_fullObject;
 
 
@@ -62,6 +63,7 @@ module.exports = function (RED) {
         options: readConfig,
         objectPropertyType: {
           simplePayload: node.object_property_simplePayload,
+          simpleWithStatus: node.object_property_simpleWithStatus,
           fullObject: node.object_property_fullObject
         },
         outputType: {

package/bacnet_server.js

@@ -2,6 +2,7 @@ const bacnet = require('./resources/node-bacstack-ts/dist/index.js');
 const pjson = require('./package.json');
 const baEnum = bacnet.enum;
 const { Store_Config_Server, Read_Config_Sync_Server } = require('./common');
+const { EventEmitter } = require("events");
 
 /**
  * Class representing a BACnet Server.
@@ -16,9 +17,10 @@ const { Store_Config_Server, Read_Config_Sync_Server } = require('./common');
  * @param {number} deviceId - The ID of the device.
  * @param {string} nodeRedVersion - The version of Node-Red.
  */
-class BacnetServer {
+class BacnetServer extends EventEmitter {
 
     constructor(client, deviceId, nodeRedVersion) {
+        super();
         let that = this;
         that.bacnetClient = client;
 
@@ -175,6 +177,69 @@ class BacnetServer {
             }
         });
 
+        that.bacnetClient.client.on('writeProperty', (data) => {
+            let objectId = data.request.objectId.type;
+            let objectInstance = data.request.objectId.instance;
+            let propId = data.request.value.property.id.toString();
+            let newValue = data.request.value.value[0].value;
+
+            if (!that.modifyObject(objectId, propId, objectInstance, newValue)) {
+                that.bacnetClient.errorResponse(data.address, data.service, data.invokeId, bacnet.enum.ErrorClass.OBJECT, bacnet.enum.ErrorCode.UNKNOWN_OBJECT);
+            }
+            that.getServerPoints(objectId, objectInstance).then(function (result) {
+                that.bacnetClient.client.simpleAckResponse(data.address, data.service, data.invokeId);
+                that.emit("writeProperty", result[0].name, newValue);
+            }).catch(function (error) {
+                that.bacnetClient.errorResponse(data.address, data.service, data.invokeId, bacnet.enum.ErrorClass.OBJECT, bacnet.enum.ErrorCode.UNKNOWN_OBJECT);
+                that.logOut("Error getting server points:  ", error);
+            });
+        });
+
+        that.bacnetClient.client.on('createObject', (data) => {
+            var defaultValue;
+            switch (data.request.values[0].value[0].type) {
+                case baEnum.ObjectType.CHARACTERSTRING_VALUE:
+                    defaultValue = "";
+                    break;
+                case baEnum.ObjectType.BINARY_VALUE:
+                    defaultValue = 0;
+                    break;
+                case baEnum.ObjectType.ANALOG_VALUE:
+                    defaultValue = false;
+                    break;
+                default:
+                    defaultValue = 0;
+                    break;
+            }
+            that.addObject(data.request.values[0].value[0].value, defaultValue);
+            that.bacnetClient.client.simpleAckResponse(data.address, data.service, data.invokeId);
+        });
+
+        that.bacnetClient.client.on('deleteObject', (data) => {
+            var type;
+            switch (data.request.objectType) {
+                case baEnum.ObjectType.CHARACTERSTRING_VALUE:
+                    type = 'SV';
+                    break;
+                case baEnum.ObjectType.BINARY_VALUE:
+                    type = 'BV';
+                    break;
+                case baEnum.ObjectType.ANALOG_VALUE:
+                    type = 'AV';
+                    break;
+                default:
+                    type = 'AV';
+                    break;
+            }
+
+            var req = { body: { type: type, instance: data.request.instance } };
+            that.clearServerPoint(req).then(function (result) {
+                that.bacnetClient.client.simpleAckResponse(data.address, data.service, data.invokeId);
+            }).catch(function (error) {
+                console.log(error)
+            });
+        });
+
         //do initial iAm broadcast when BACnet server starts
         that.bacnetClient.client.iAmResponse(that.deviceId, baEnum.Segmentation.SEGMENTED_BOTH, that.vendorId);
     }
@@ -336,6 +401,37 @@ class BacnetServer {
         return null;
     }
 
+    /**
+     * Retrieves a specific property of an object based on the object ID, property ID, and instance number and modify his value.
+     * 
+     * @param {number} objectId - The ID of the object type.
+     * @param {number} propId - The ID of the property to retrieve.
+     * @param {number} instance - The instance number of the object.
+     * @param {number} newValue - The the new value for update.
+     * @returns {any} The requested property value if found, otherwise null.
+     */
+    modifyObject(objectId, propId, instance, newValue) { //TODO factorise with getObject
+        let that = this;
+        let objectGroup = that.objectStore[objectId];
+
+        if (Array.isArray(objectGroup)) {
+            for (let i = 0; i < objectGroup.length; i++) {
+                let object = objectGroup[i];
+                if (object[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance == instance) {
+                    let requestedProperty = object[propId];
+                    if (requestedProperty !== null && requestedProperty !== undefined && typeof requestedProperty !== "undefined") {
+                        that.objectStore[objectId][i][propId][0].value = newValue;
+                        return requestedProperty;
+                    }
+                }
+            }
+        } else {
+            return objectGroup[propId];
+        }
+
+        return null;
+    }
+
     /**
      * Retrieves the properties of a specific object instance from the objectStore based on the provided parameters.
      * 
@@ -503,7 +599,7 @@ class BacnetServer {
      * @returns {Promise<Array>} A promise that resolves with an array of points sorted by instance number.
      * @throws {Error} If an error occurs during the retrieval process.
      */
-    getServerPoints() {
+    getServerPoints(typeFilter = null, instanceFilter = null) {
         let that = this;
         let points = [];
 
@@ -515,11 +611,21 @@ class BacnetServer {
                         let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
                         let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
 
-                        points.push({
-                            name: objectName,
-                            type: "AV",
-                            instance
-                        });
+                        if (typeFilter === null && instanceFilter === null) {
+                            points.push({
+                                name: objectName,
+                                type: "AV",
+                                instance
+                            });
+                        } else {
+                            if ((typeFilter === baEnum.ObjectType.ANALOG_VALUE) && (instanceFilter === instance)) {
+                                points.push({
+                                    name: objectName,
+                                    type: "AV",
+                                    instance
+                                });
+                            }
+                        }
                     });
                 }
 
@@ -529,11 +635,21 @@ class BacnetServer {
                         let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
                         let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
 
-                        points.push({
-                            name: objectName,
-                            type: "SV",
-                            instance
-                        });
+                        if (typeFilter === null && instanceFilter === null) {
+                            points.push({
+                                name: objectName,
+                                type: "SV",
+                                instance
+                            });
+                        } else {
+                            if ((typeFilter === baEnum.ObjectType.CHARACTERSTRING_VALUE) && (instanceFilter === instance)) {
+                                points.push({
+                                    name: objectName,
+                                    type: "SV",
+                                    instance
+                                });
+                            }
+                        }
                     });
                 }
 
@@ -543,11 +659,21 @@ class BacnetServer {
                         let instance = point[baEnum.PropertyIdentifier.OBJECT_IDENTIFIER][0].value.instance;
                         let objectName = point[baEnum.PropertyIdentifier.OBJECT_NAME][0].value;
 
-                        points.push({
-                            name: objectName,
-                            type: "BV",
-                            instance
-                        });
+                        if (typeFilter === null && instanceFilter === null) {
+                            points.push({
+                                name: objectName,
+                                type: "BV",
+                                instance
+                            });
+                        } else {
+                            if ((typeFilter === baEnum.ObjectType.BINARY_VALUE) && (instanceFilter === instance)) {
+                                points.push({
+                                    name: objectName,
+                                    type: "BV",
+                                    instance
+                                });
+                            }
+                        }
                     });
                 }