@bitpoolos/edge-bacnet 1.1.7 → 1.2.1

package/bacnet_device.js

@@ -14,40 +14,74 @@ class BacnetDevice {
             that.pointsList = config.pointsList;
             that.pointListUpdateTs = config.pointListUpdateTs;
             that.manualDiscoveryMode = config.manualDiscoveryMode;
+            that.mDiscoverInstanceRange = config.mDiscoverInstanceRange;
+            that.pointListRetryCount = config.pointListRetryCount;
 
         } else if(fromImport == false) {
-
-            if(config.header.source) {
-                that.address = {address: config.header.sender.address, net: config.header.source.net, adr: config.header.source.adr};
+            if(config.net && config.adr) {
+                that.address = {address: config.address, net: config.net, adr: config.adr};
                 that.isMstp = true;
             } else {
-                that.address = config.header.sender.address;
+                that.address = config.address;
                 that.isMstp = false;
             }
-            that.deviceId = config.payload.deviceId;
-            that.maxApdu = config.payload.maxApdu;
-            that.segmentation = config.payload.segmentation;
-            that.vendorId = config.payload.vendorId;
+            that.deviceId = config.deviceId;
+            that.maxApdu = config.maxApdu;
+            that.segmentation = config.segmentation;
+            that.vendorId = config.vendorId;
             that.lastSeen = null;
             that.deviceName = null;
             that.pointsList = [];
             that.pointListUpdateTs = null;
             that.manualDiscoveryMode = false;
+            that.mDiscoverInstanceRange = {start: 0, end: 100};
+            that.pointListRetryCount = 0;
         }
     }
 
     updateDeviceConfig(config) {
-        if(config.header.sender.address !== "" && config.header.sender.address !== null && config.header.sender.address !== "undefined") {
-            if(config.header.source) {
-                this.address = {address: config.header.sender.address, net: config.header.source.net, adr: config.header.source.adr};
+        if(config.address !== "" && config.address !== null && config.address !== "undefined") {
+            if(config.net && config.adr) {
+                this.address = {address: config.address, net: config.net, adr: config.adr};
             } else {
-                this.address = config.header.sender.address;
+                this.address = config.address;
             }
         }
-        if(Number.isInteger(config.deviceId)) this.deviceId = config.payload.deviceId;
-        if(Number.isInteger(config.maxApdu)) this.maxApdu = config.payload.maxApdu;
-        if(Number.isInteger(config.segmentation)) this.segmentation = config.payload.segmentation;
-        if(Number.isInteger(config.vendorId)) this.vendorId = config.payload.vendorId;
+        if(Number.isInteger(config.deviceId)) this.deviceId = config.deviceId;
+        if(Number.isInteger(config.maxApdu)) this.maxApdu = config.maxApdu;
+        if(Number.isInteger(config.segmentation)) this.segmentation = config.segmentation;
+        if(Number.isInteger(config.vendorId)) this.vendorId = config.vendorId;
+    }
+
+    getPointListRetryCount() {
+        return this.pointListRetryCount;
+    }
+
+    incrementPointListRetryCount() {
+        this.pointListRetryCount++;
+    }
+
+    clearPointListRetryCount() {
+        this.pointListRetryCount = 0;
+    }
+
+    getmDiscoverInstanceRange() {
+        return this.mDiscoverInstanceRange;
+    }
+
+    setmDiscoverInstanceRange(range) {
+        this.mDiscoverInstanceRange = range;
+    }
+
+    updatemDiscoverInstanceRange(position, value) {
+        this.mDiscoverInstanceRange[position] = value;
+    }
+
+    shouldBeInManualMode() {
+        if(this.mDiscoverInstanceRange.start >= 1000000 || this.mDiscoverInstanceRange.end >= 1000000) {
+            return false;
+        }
+        return true;
     }
 
     setManualDiscoveryMode(bool) {

package/bacnet_gateway.html

@@ -96,6 +96,7 @@
             local_device_port: {value: 47808, required: true},
             apduSize: {value: "5", required: true},
             maxSegments: {value: "0x50", required: true},
+            retries: {value: "5", required: true},
             broadCastAddr: {value: "255.255.255.255", required: true},
             toLogIam: {value: true},
             discover_polling_schedule: {value: ""},
@@ -110,9 +111,9 @@
             manual_instance_range_end: {value: 10000},
             logErrorToConsole: {value: false},
             serverEnabled: {value: false},
-            bacnetServerRebuildSchedule: {value: ""},
-            bacnetServerRebuildSchedule_value: {value: "1", required: true},
-            bacnetServerRebuildSchedule_options: {value: "Hours", required: true}
+            device_read_schedule: {value: ""},
+            device_read_schedule_value: {value: "1", required: true},
+            device_read_schedule_options: {value: "Minutes", required: true}
         },
         networkInterfaces: [],
         inputs: 1,
@@ -260,7 +261,8 @@
                 },
                 components: {
                     "p-button": primevue.button,
-                    "p-confirm-dialog": primevue.confirmdialog
+                    "p-confirm-dialog": primevue.confirmdialog,
+                    "p-confirm-popup": primevue.confirmpopup 
                 }
             };
 
@@ -268,9 +270,46 @@
             vueapp.use(primevue.config.default);
             vueapp.use(primevue.confirmpopup);
             vueapp.use(primevue.confirmationservice);
-            node.vm = vueapp.mount("#clearServerContainer");
-            
+            node.vm1 = vueapp.mount("#clearServerContainer");
+
+            $("#file-upload").on("change", function(event) {
+                const input = event.target.files[0];
+                const reader = new FileReader(); 
+
+                reader.onload = function (e) {
+                    const text = e.target.result;
+
+                    let jsonPayload = JSON.parse(text);
+
+                    $.ajax({
+                        type: "POST",
+                        url: '/bitpool-bacnet-data/updateDeviceList',
+                        dataType: 'json',
+                        contentType: 'application/json',
+                        data: JSON.stringify(jsonPayload),
+                        success: function (result) {
+                        },
+                        timeout: 10000
+                    });
+                    
+                };
 
+                reader.readAsText(input);
+            });
+
+            $("#file-export").click(function(params) {
+                $.ajax({
+                    url: '/bitpool-bacnet-data/getDeviceList',
+                    success: function (deviceList) {
+                        let data = "text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(deviceList));
+                        let aEle = document.getElementById("exportJSON");
+                        aEle.setAttribute("href", "data:" + data);
+                        aEle.setAttribute("download", "bitpool-bacnet-devices.json");
+                        aEle.click();
+                    },
+                    timeout: 10000
+                });
+            });
         },
         oneditsave: function (test) {
             let node = this;
@@ -280,9 +319,9 @@
                 document.getElementById("node-input-discover_polling_schedule_options").value
             );
 
-            document.getElementById("node-input-bacnetServerRebuildSchedule").value = getTimePeriodInSeconds(
-                document.getElementById("node-input-bacnetServerRebuildSchedule_value").value,
-                document.getElementById("node-input-bacnetServerRebuildSchedule_options").value
+            document.getElementById("node-input-device_read_schedule").value = getTimePeriodInSeconds(
+                document.getElementById("node-input-device_read_schedule_value").value,
+                document.getElementById("node-input-device_read_schedule_options").value
             );
         }
     });
@@ -353,6 +392,29 @@
                 align-items: center;
                 justify-content: space-around;
             }
+            button {
+                height: 34px;
+                border-radius: 5px !important;
+            }
+            .inputStyle {
+                color: var(--red-ui-workspace-button-color-hover) !important;
+                background: var(--red-ui-workspace-button-background-hover);
+                border: 1px solid var(--red-ui-secondary-border-color);
+                border-radius: 5px !important;
+            }
+            input[type="file"] {
+                display: none !important;
+            }
+            .custom-file-upload {
+                border: 1px solid var(--red-ui-secondary-border-color);
+                border-radius: 5px !important;
+                padding: 6px 12px;
+                cursor: pointer;
+            }
+            .uploadButton {
+                margin-bottom: 5px !important;
+                margin-left: 30px !important;
+            }
 
         </style>
 
@@ -401,7 +463,6 @@
             </div>
 
             <div id='read-discover-tab' style='display:none'>
-
                 <div class="form-row">
                     <label for="node-input-apduTimeout"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.apduTimeout"></span>Apdu Timeout</label>
                     <input type="text" id="node-input-apduTimeout" placeholder="10000">
@@ -433,8 +494,25 @@
                     </select>
                 </div>
     
+                <div class="form-row">
+                    <label for="node-input-retries"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.retries"></span>Number of Retries</label>
+                    <select id="node-input-retries">
+                        <option value="0">0</option>
+                        <option value="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option value="5">5</option>
+                        <option value="6">6</option>
+                        <option value="7">7</option>
+                        <option value="8">8</option>
+                        <option value="9">9</option>
+                        <option value="10">10</option>
+                    </select>
+                </div>
+
                 <div class="form-row" style="align-items: center; display: flex;">
-                    <label for="node-input-discover_polling_schedule_value"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.bacnet_polling_schedule"></span>Discover Frequency</label>
+                    <label for="node-input-discover_polling_schedule_value"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.bacnet_polling_schedule"></span>Device Discover Frequency</label>
                     <p style="margin-right: 5px; margin-bottom: 0px; padding-left: 7px;">Every</p>
                     <input type="text" id="node-input-discover_polling_schedule" style="display: none;">
                     <input type="text" id="node-input-discover_polling_schedule_value" placeholder="5" style="width: 70px; margin-right: 5px;">
@@ -452,6 +530,19 @@
                     <a style="padding-left: 60px;">Start: </a><input type="number" id="node-input-manual_instance_range_start" style="width: 125px;" min="0" max="100000"/>
                     <a style="padding-left: 35px;">End: </a><input type="number" id="node-input-manual_instance_range_end" style="width: 125px;" min="1" max="100000"/>
                 </div>
+
+                <div class="form-row" style="align-items: center; display: flex;">
+                    <label for="node-input-device_read_schedule_value"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.device_read_schedule"></span>Object Discover Frequency</label>
+                    <p style="margin-right: 5px; margin-bottom: 0px; padding-left: 7px;">Every</p>
+                    <input type="text" id="node-input-device_read_schedule" style="display: none;">
+                    <input type="text" id="node-input-device_read_schedule_value" placeholder="5" style="width: 70px; margin-right: 5px;">
+                    <select name="timePeriod" id="node-input-device_read_schedule_options" style="width: 120px; margin-right: 5px;">
+                        <option value="Seconds">Seconds</option>
+                        <option value="Minutes">Minutes</option>
+                        <option value="Hours">Hours</option>
+                        <option value="Days">Days</option>
+                    </select>
+                </div>
     
                 <div class="form-row">
                     <label for="node-input-toLog">
@@ -462,17 +553,32 @@
 
                 <div class="form-row">
                     <label for="node-input-logErrorToConsole">
-                        Log BACnet errors to console: 
+                        Log BACnet errors to console:
                     </label>
                     <input type="checkbox" id="node-input-logErrorToConsole" style="width: auto;"/>
                 </div>
 
+                <div class="form-row" id="importDeviceList">
+                    <label>
+                        Device List:
+                    </label>
+                    <label for="file-upload" class="custom-file-upload">
+                        <i class="fa fa-cloud-upload" id="fileLabel"></i> <a id="fileLabelText" style="padding-left: 10px;">Import</a>
+                    </label>
+                    <input type="file" id="file-upload" accept="application/JSON" class="inputStyle" style="width: 258px;">
+                    <label for="file-export" class="custom-file-upload" style="margin-left: 30px;">
+                        <i class="fa fa-cloud-download" id="fileLabel"></i> <a id="fileLabelText" style="padding-left: 10px;">Export</a>
+                    </label>
+                    <input id="file-export" class="inputStyle" style="width: 258px; display: none;">
+                    <a id="exportJSON" style="display: none"></a>
+                </div>
             </div>
+
             <div id='read-server-tab' style='display:none'>
                 <div class="read_server_parent_div">
                     <div class="form-row">
                         <label for="node-input-serverEnabled">
-                            Enabled: 
+                            Enabled:
                         </label>
                         <input type="checkbox" id="node-input-serverEnabled" style="width: auto;"/>
                     </div>
@@ -480,10 +586,8 @@
                     <div class="form-row" id="clearServerContainer" style="align-items: center; display: flex;">
                         <label for="node-input-bacnetServerRebuildSchedule_value" class="clear_server_span"><i class="icon-tag"></i> <span data-i18n="bitpool-bacnet.label.bacnetServerRebuildSchedule"></span>  </label>
                         <p-button class="bacnetServerRebuildSchedule_clearButton p-button-danger" @click="confirm($event)" label="Reinitialize Server" ></p-button>
-                        
                     </div>
                 </div>
-
             </div>
 
     </script>