@bitpoolos/edge-bacnet 1.4.1 → 1.4.3

package/bitpool_inject.html

@@ -42,7 +42,124 @@
                 </div>
             </div>
 
-            
+            <div class="form-row" style="display: flex; width: fit-content; flex-wrap: nowrap; flex-direction: row; padding-top: 10px; margin-left: auto; margin-right: auto;">
+
+                <div
+                  id="node-input-object_properties_group"
+                  style="display: flex; align-items: flex-start; flex-direction: column;">
+                    <label
+                    for="node-input-object_properties_group"
+                    style="display: flex; align-items: center; white-space: nowrap; text-decoration: underline;"
+                    >
+                        Object Properties:
+                    </label>
+                    
+                    <div class="objectPropertiesLabel">
+                        <label
+                        for="node-input-object_property_simplePayload"
+                        style="padding-left: 4px; width: auto; align-items: start;"
+                        class="objectPropertiesLabel">
+                        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_simplePayload"></span>
+                        <input
+                            style="margin-left: 5px;"
+                            class=" objectProp"
+                            type="checkbox"
+                            id="node-input-object_property_simplePayload" />
+                        <a style="white-space: nowrap; padding-left: 20px;">Simple Payload</a>
+                        </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"
+                        style="padding-left: 4px; width: auto; align-items: start;"
+                        class="objectPropertiesLabel">
+                        <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.object_property_fullObject"></span>
+                        <input
+                            style="margin-left: 5px;"
+                            class=" objectProp"
+                            type="checkbox"
+                            id="node-input-object_property_fullObject" />
+                        <a style="white-space: nowrap; padding-left: 20px;">Full Object</a>
+                        </label>
+                    </div>
+        
+                </div>
+                <div
+                  id="node-input-msgType"
+                  style="display: flex; align-items: flex-start; flex-direction: column; padding-left: 50px;">
+                  <label for="node-input-msgType" style="text-decoration: underline;"> Message type: </label>
+                  <!-- class= checkbox-round -->
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-json"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-json"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Block per device</label
+                    >
+                  </div>
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-mqtt"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-mqtt"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Individual msgs</label
+                    >
+                  </div>
+                  <div style="display: flex; flex-direction: row; align-items: flex-start;">
+                    <input
+                      class="checkbox-round"
+                      type="checkbox"
+                      id="node-input-pointJson"
+                      style="width: 13px; margin-left: 5px;" /><label
+                      for="node-input-pointJson"
+                      style="padding-left: 20px; width: fit-content;"
+                      >Individual JSON</label
+                    >
+                  </div>
+                </div>
+            </div>
+        </div>
+
+
+        <div class="injectHeading" style="margin-top: 20px;">
+            <a>Topic Properties</a>
+        </div>
+
+        <div class="objectPropertiesLabel" style="margin-top: 20px;">
+            <label
+            for="node-input-useDeviceName"
+            style="padding-left: 4px; width: auto; align-items: start;"
+            class="objectPropertiesLabel">
+            <i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.useDeviceName"></span>
+            <input
+                style="margin-left: 5px;"
+                class=" objectProp"
+                type="checkbox"
+                id="node-input-useDeviceName" />
+            <a style="white-space: nowrap; padding-left: 20px;">Use device name in topic</a>
+            </label>
         </div>
 
         <div class="injectHeading" style="margin-top: 20px;">
@@ -373,6 +490,13 @@
                 payloadType: { value: "date" },
                 doPoll: { value: true },
                 doDiscover: { value: false },
+                json: { value: false },
+                mqtt: { value: false },
+                pointJson: { value: true },
+                object_property_simplePayload: { value: false },
+                object_property_simpleWithStatus: { value: false },
+                object_property_fullObject: { value: true },
+                useDeviceName: { value: true },
             },
             icon: "bitpool.svg",
             inputs: 0,
@@ -669,10 +793,28 @@
                 $("#inject-time-type-select").trigger("change");
                 $("#inject-time-interval-time-start").trigger("change");
 
+                document.getElementById("node-input-object_property_simplePayload").checked = node.object_property_simplePayload;
+                document.getElementById("node-input-object_property_simplePayload").onclick = handlePayloadCheckboxClick;
+                document.getElementById("node-input-object_property_simpleWithStatus").checked = node.object_property_simpleWithStatus;
+                document.getElementById("node-input-object_property_simpleWithStatus").onclick = handlePayloadCheckboxClick;
+                document.getElementById("node-input-object_property_fullObject").checked = node.object_property_fullObject;
+                document.getElementById("node-input-object_property_fullObject").onclick = handlePayloadCheckboxClick;
+
+                document.getElementById("node-input-useDeviceName").checked = node.useDeviceName;
+
 
                 document.getElementById("node-input-doDiscover").onclick = handleCheckboxClick;
                 document.getElementById("node-input-doPoll").onclick = handleCheckboxClick;
 
+                document.getElementById("node-input-json").checked = node.json;
+                document.getElementById("node-input-json").onclick = handleMsgTypeClick;
+                document.getElementById("node-input-mqtt").checked = node.mqtt;
+                document.getElementById("node-input-mqtt").onclick = handleMsgTypeClick;
+                document.getElementById("node-input-pointJson").checked = node.pointJson;
+                document.getElementById("node-input-pointJson").onclick = handleMsgTypeClick;
+
+
+
                 function handleCheckboxClick() {
                     if (this.id == "node-input-doDiscover") {
                         document.getElementById("node-input-doPoll").checked = false;
@@ -682,6 +824,36 @@
                     }
                 }
 
+                function handlePayloadCheckboxClick() {
+                    if (this.id == "node-input-object_property_simplePayload") {
+                        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 = false;
+                        document.getElementById("node-input-object_property_simpleWithStatus").checked = false;
+                    }
+                }
+
+                function handleMsgTypeClick() {
+                    if (this.id == "node-input-json") {
+                        document.getElementById("node-input-mqtt").checked = false;
+                        document.getElementById("node-input-pointJson").checked = false;
+                    }
+                    if (this.id == "node-input-mqtt") {
+                        document.getElementById("node-input-json").checked = false;
+                        document.getElementById("node-input-pointJson").checked = false;
+                    }
+                    if (this.id == "node-input-pointJson") {
+                        document.getElementById("node-input-json").checked = false;
+                        document.getElementById("node-input-mqtt").checked = false;
+                    }
+                }
+
             },
             oneditsave: function () {
                 var repeat = "";

package/bitpool_inject.js

@@ -19,28 +19,28 @@
 */
 
 
- module.exports = function(RED) {
+module.exports = function (RED) {
     "use strict";
-    const {scheduleTask} = require("cronosjs");
+    const { scheduleTask } = require("cronosjs");
 
     function BitpoolInjectNode(n) {
-        RED.nodes.createNode(this,n);
+        RED.nodes.createNode(this, n);
 
         /* Handle legacy */
-        if(!Array.isArray(n.props)){
+        if (!Array.isArray(n.props)) {
             n.props = [];
             n.props.push({
-                p:'payload',
-                v:n.payload,
-                vt:n.payloadType
+                p: 'payload',
+                v: n.payload,
+                vt: n.payloadType
             });
             n.props.push({
-                p:'topic',
-                v:n.topic,
-                vt:'str'
+                p: 'topic',
+                v: n.topic,
+                vt: 'str'
             });
         } else {
-            for (var i=0,l=n.props.length; i<l; i++) {
+            for (var i = 0, l = n.props.length; i < l; i++) {
                 if (n.props[i].p === 'payload' && !n.props[i].hasOwnProperty('v')) {
                     n.props[i].v = n.payload;
                     n.props[i].vt = n.payloadType;
@@ -56,6 +56,17 @@
         this.once = n.once;
         this.doPoll = n.doPoll;
         this.doDiscover = n.doDiscover;
+
+        this.object_property_simplePayload = n.object_property_simplePayload;
+        this.object_property_simpleWithStatus = n.object_property_simpleWithStatus;
+        this.object_property_fullObject = n.object_property_fullObject;
+
+        this.useDeviceName = n.useDeviceName;
+
+        this.json = n.json;
+        this.mqtt = n.mqtt;
+        this.pointJson = n.pointJson;
+
         this.onceDelay = (n.onceDelay || 0.1) * 1000;
         this.interval_id = null;
         this.cronjob = null;
@@ -68,7 +79,7 @@
                     prop.exp = RED.util.prepareJSONataExpression(val, node);
                 }
                 catch (err) {
-                    node.error(RED._("inject.errors.invalid-expr", {error:err.message}));
+                    node.error(RED._("inject.errors.invalid-expr", { error: err.message }));
                     prop.exp = null;
                 }
             }
@@ -83,27 +94,39 @@
             if (this.repeat && !isNaN(this.repeat) && this.repeat > 0) {
                 this.repeat = this.repeat * 1000;
                 this.debug(RED._("inject.repeat", this));
-                this.interval_id = setInterval(function() {
+                this.interval_id = setInterval(function () {
                     node.emit("input", {});
                 }, this.repeat);
             } else if (this.crontab) {
                 this.debug(RED._("inject.crontab", this));
-                this.cronjob = scheduleTask(this.crontab,() => { node.emit("input", {})});
+                this.cronjob = scheduleTask(this.crontab, () => { node.emit("input", {}) });
             }
         };
 
         if (this.once) {
-            this.onceTimeout = setTimeout( function() {
-                node.emit("input",{});
+            this.onceTimeout = setTimeout(function () {
+                node.emit("input", {});
                 node.repeaterSetup();
             }, this.onceDelay);
         } else {
             node.repeaterSetup();
         }
 
-        this.on("input", function(msg, send, done) {
+        this.on("input", function (msg, send, done) {
             msg.doDiscover = node.doDiscover;
             msg.doPoll = node.doPoll;
+
+            msg.simplePayload = node.object_property_simplePayload;
+            msg.simpleWithStatus = node.object_property_simpleWithStatus;
+            msg.fullObject = node.object_property_fullObject;
+
+            msg.json = node.json;
+            msg.mqtt = node.mqtt;
+            msg.pointJson = node.pointJson;
+
+            msg.useDeviceName = node.useDeviceName;
+
+
             var errors = [];
             var props = this.props;
             if (msg.__user_inject_props__ && Array.isArray(msg.__user_inject_props__)) {
@@ -124,14 +147,14 @@
                             var val = RED.util.evaluateJSONataExpression(exp, msg);
                             RED.util.setMessageProperty(msg, property, val, true);
                         }
-                        catch  (err) {
+                        catch (err) {
                             errors.push(err.message);
                         }
                     }
                     return;
                 }
                 try {
-                    RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
+                    RED.util.setMessageProperty(msg, property, RED.util.evaluateNodeProperty(value, valueType, this, msg), true);
                 } catch (err) {
                     errors.push(err.toString());
                 }
@@ -146,9 +169,9 @@
         });
     }
 
-    RED.nodes.registerType("Bitpool-Inject",BitpoolInjectNode);
+    RED.nodes.registerType("Bitpool-Inject", BitpoolInjectNode);
 
-    BitpoolInjectNode.prototype.close = function() {
+    BitpoolInjectNode.prototype.close = function () {
         if (this.onceTimeout) {
             clearTimeout(this.onceTimeout);
         }
@@ -160,7 +183,7 @@
         }
     };
 
-    RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function(req,res) {
+    RED.httpAdmin.post("/inject/:id", RED.auth.needsPermission("inject.write"), function (req, res) {
         var node = RED.nodes.getNode(req.params.id);
         if (node != null) {
             try {
@@ -170,9 +193,9 @@
                     node.receive();
                 }
                 res.sendStatus(200);
-            } catch(err) {
+            } catch (err) {
                 res.sendStatus(500);
-                node.error(RED._("inject.failed",{error:err.toString()}));
+                node.error(RED._("inject.failed", { error: err.toString() }));
             }
         } else {
             res.sendStatus(404);

package/package.json

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

package/resources/style.css

@@ -15,6 +15,16 @@
 
 /* Read node styles */
 
+.refreshReadListButton {
+    border: none;
+    border-radius: 40px;
+    height: 35px;
+    width: 35px;
+    & i {
+        color: #6c757d !important;
+    }
+}
+
 .p-treenode-label {
     color: black;
     width: 100%;
@@ -150,6 +160,8 @@
     float: right;
     display: flex;
     align-items: center;
+    padding: 5px;
+    font-weight: bold;
 }
 .removeAllDevicesButton:hover {
     background-color: #d5d5d5;
@@ -247,7 +259,6 @@
     z-index: 10;
 }
 
-
 .context-menu {
     --mouse-x: 0;
     --mouse-y: 0;

package/treeBuilder.js

@@ -1,4 +1,5 @@
 const { Store_Config } = require("./common");
+const { BacnetDevice } = require("./bacnet_device");
 
 /**
  * The `treeBuilder` class is responsible for building and processing the network tree structure.
@@ -111,6 +112,42 @@ class treeBuilder {
         }
     }
 
+    addEmptyIpRootDevice(childDevice) {
+
+        const ipAddress = this.getDeviceIpAddress(childDevice);
+
+        let deviceIndex = this.deviceList.findIndex(ele => ele.address === ipAddress && ele.deviceId === null && ele.deviceName === ipAddress && ele.displayName === ipAddress);
+
+        if (deviceIndex === -1) {
+            let newDevice = {
+                address: ipAddress,
+                isMstp: false,
+                deviceId: null,
+                maxApdu: childDevice.getMaxApdu(),
+                segmentation: childDevice.getSegmentation(),
+                vendorId: childDevice.getVendorId(),
+                lastSeen: null,
+                deviceName: ipAddress,
+                pointsList: [],
+                pointListUpdateTs: null,
+                manualDiscoveryMode: false,
+                pointListRetryCount: 0,
+                priorityQueueIsActive: false,
+                priorityQueue: [],
+                lastPriorityQueueTS: null,
+                childDevices: [childDevice.getDeviceId()],
+                parentDeviceId: null,
+                displayName: ipAddress,
+                protocolServicesSupported: [],
+                isProtocolServicesSet: false,
+                isInitialQuery: true,
+            };
+
+            let newBacnetDevice = new BacnetDevice(true, newDevice);
+            this.deviceList.push(newBacnetDevice);
+        }
+    }
+
     /**
      * Process the points of a device and add them to the render list.
      * 
@@ -124,7 +161,7 @@ class treeBuilder {
      */
     async processDevicePoints(device, deviceObject, deviceName, ipAddress, deviceId, index) {
         // Initialize the list of children points
-        const children = [];
+        let children = [];
 
         // Process each point in the device object
         for (const pointName in deviceObject) {
@@ -171,6 +208,7 @@ class treeBuilder {
             parentDeviceId: device.getDeviceId(),
             showAdded: false,
             bacnetType: point.meta.objectId.type,
+            bacnetInstance: point.meta.objectId.instance,
         };
     }
 
@@ -305,7 +343,21 @@ class treeBuilder {
                 } else {
                     mstpNetworkFolder.children[mstpDeviceIndex] = newDeviceEntry;
                 }
+            } else {
+                //no parent found in render list
+
+                if (parentDeviceId !== null) {
+                    let parentDeviceListIndex = this.deviceList.findIndex(ele => ele.getDeviceId == parentDeviceId);
+
+                    if (parentDeviceListIndex !== -1) {
+                        let parentDevice = this.deviceList[parentDeviceListIndex];
+                        this.addRootDeviceFolder(parentDevice, parentDevice.getDeviceName(), parentDeviceListIndex, parentDevice.getAddress(), parentDeviceId);
+                    }
+                } else {
+                    this.addEmptyIpRootDevice(device);
+                }
             }
+
         } else {
             // Add the new device entry to the root of the render list
             if (foundIndex === -1) {