@bitpoolos/edge-bacnet 1.0.6 → 1.0.9

package/common.js

@@ -5,8 +5,9 @@
 const { createLogger, format, transports } = require('winston');
 const { randomUUID } = require('crypto');
 const os = require('os');
+const { exec } = require("child_process");
+const baEnum = require('./resources/node-bacnet/index.js').enum;
 
-const baEnum = require('./resources/bacstack/lib/enum');
 
 const logger = createLogger({
     format: format.combine(
@@ -63,7 +64,23 @@ class BacnetConfig {
 };
 
 class BacnetClientConfig {
-  constructor(apduTimeout, localIpAdrress, local_device_port, apduSize, maxSegments, broadCastAddr, discover_polling_schedule, device_id_range_enabled, device_id_range_start, device_id_range_end) {
+  constructor(
+    apduTimeout, 
+    localIpAdrress, 
+    local_device_port, 
+    apduSize, 
+    maxSegments, 
+    broadCastAddr, 
+    discover_polling_schedule,
+    device_id_range_enabled, 
+    device_id_range_start, 
+    device_id_range_end, 
+    toRestartNodeRed, 
+    deviceId,
+    manual_instance_range_enabled,
+    manual_instance_range_start,
+    manual_instance_range_end
+  ) {
     this.apduTimeout = apduTimeout;
     this.localIpAdrress = localIpAdrress;
     this.port = local_device_port;
@@ -74,6 +91,11 @@ class BacnetClientConfig {
     this.device_id_range_enabled = device_id_range_enabled;
     this.device_id_range_start = device_id_range_start;
     this.device_id_range_end = device_id_range_end;
+    this.toRestartNodeRed = toRestartNodeRed;
+    this.deviceId = deviceId;
+    this.manual_instance_range_enabled = manual_instance_range_enabled;
+    this.manual_instance_range_start = manual_instance_range_start;
+    this.manual_instance_range_end = manual_instance_range_end;
   }
 };
 
@@ -85,7 +107,6 @@ class ReadCommandConfig {
   }
 };
 
-
 class WriteCommandConfig {
   constructor(device, objects) {
     this.device = {
@@ -103,10 +124,10 @@ class WriteCommandConfig {
 };
 
 const getUnit = function(id) {
-  for (var key in baEnum.UnitsId) {
-    if(baEnum.UnitsId[key] == id){
-      if (baEnum.UnitsId.hasOwnProperty(key)) {
-        let unitsArr = key.split("_"); unitsArr.shift();
+  for (var key in baEnum.EngineeringUnits) {
+    if(baEnum.EngineeringUnits[key] == id) {
+      if (baEnum.EngineeringUnits.hasOwnProperty(key)) {
+        let unitsArr = key.split("_");
         let unit;
         unitsArr.forEach((ele, index) =>{
           if(index == 0){
@@ -119,6 +140,7 @@ const getUnit = function(id) {
       }
     }
   }
+  return "no-units";
 };
 
 const generateId = function() {
@@ -161,5 +183,38 @@ const roundDecimalPlaces = function(value, decimals) {
   return value;
 }
 
+const doNodeRedRestart = function() {
+  return new Promise(function(resolve, reject) {
+    try {
+      exec("restart", (error, stdout, stderr) => {
+        if (error) {
+            console.log(`Node-Red restart error: ${error.message}`);
+            reject(error.message);
+        }
+        if (stderr) {
+            console.log(`Node-Red restart stderr: ${stderr}`);
+            reject(stderr);
+        }
+        resolve(stdout);
+      });
+    } catch(e){
+      console.log(`Node-Red restart error: ${e}`);
+      reject(e);
+    }
+  });
+};
 
-module.exports = { DeviceObjectId, DeviceObject, BacnetConfig, BacnetClientConfig, ReadCommandConfig, WriteCommandConfig, logger, getUnit, generateId, getIpAddress, roundDecimalPlaces };
+module.exports = {
+  DeviceObjectId, 
+  DeviceObject, 
+  BacnetConfig, 
+  BacnetClientConfig, 
+  ReadCommandConfig, 
+  WriteCommandConfig, 
+  logger, 
+  getUnit, 
+  generateId, 
+  getIpAddress, 
+  roundDecimalPlaces, 
+  doNodeRedRestart
+};

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@bitpoolos/edge-bacnet",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "A bacnet gateway for node-red",
   "dependencies": {
     "async-mutex": "^0.4.0",
     "cronosjs": "^1.7.1",
+    "debug": "^4.1.1",
+    "iconv-lite": "^0.5.1",
+    "underscore": "^1.10.2",
+    "node-bacnet": "^0.2.4",
     "toad-scheduler": "^1.6.0",
-    "winston": "^3.2.1",
-    "debug": "^3.1.0",
-    "iconv-lite": "^0.4.19"
+    "winston": "^3.2.1"
   },
   "node-red": {
     "version": ">=2.2.2",

package/resources/confirmationservice.min.js

@@ -0,0 +1 @@
+this.primevue=this.primevue||{},this.primevue.confirmationservice=function(e,i){"use strict";function r(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=r(e);return{install:e=>{const r={require:e=>{t.default.emit("confirm",e)},close:()=>{t.default.emit("close")}};e.config.globalProperties.$confirm=r,e.provide(i.PrimeVueConfirmSymbol,r)}}}(primevue.confirmationeventbus,primevue.useconfirm);

package/resources/confirmdialog.min.js

@@ -0,0 +1 @@
+this.primevue=this.primevue||{},this.primevue.confirmdialog=function(e,o,i,t){"use strict";function n(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var c=n(e),s=n(o),a={name:"ConfirmDialog",props:{group:String,breakpoints:{type:Object,default:null}},confirmListener:null,closeListener:null,data:()=>({visible:!1,confirmation:null}),mounted(){this.confirmListener=e=>{e&&e.group===this.group&&(this.confirmation=e,this.confirmation.onShow&&this.confirmation.onShow(),this.visible=!0)},this.closeListener=()=>{this.visible=!1,this.confirmation=null},s.default.on("confirm",this.confirmListener),s.default.on("close",this.closeListener)},beforeUnmount(){s.default.off("confirm",this.confirmListener),s.default.off("close",this.closeListener)},methods:{accept(){this.confirmation.accept&&this.confirmation.accept(),this.visible=!1},reject(){this.confirmation.reject&&this.confirmation.reject(),this.visible=!1},onHide(){this.confirmation.onHide&&this.confirmation.onHide(),this.visible=!1}},computed:{header(){return this.confirmation?this.confirmation.header:null},message(){return this.confirmation?this.confirmation.message:null},blockScroll(){return!this.confirmation||this.confirmation.blockScroll},position(){return this.confirmation?this.confirmation.position:null},iconClass(){return["p-confirm-dialog-icon",this.confirmation?this.confirmation.icon:null]},acceptLabel(){return this.confirmation?this.confirmation.acceptLabel||this.$primevue.config.locale.accept:null},rejectLabel(){return this.confirmation?this.confirmation.rejectLabel||this.$primevue.config.locale.reject:null},acceptIcon(){return this.confirmation?this.confirmation.acceptIcon:null},rejectIcon(){return this.confirmation?this.confirmation.rejectIcon:null},acceptClass(){return["p-confirm-dialog-accept",this.confirmation?this.confirmation.acceptClass:null]},rejectClass(){return["p-confirm-dialog-reject",this.confirmation?this.confirmation.rejectClass||"p-button-text":null]},autoFocusAccept(){return void 0===this.confirmation.defaultFocus||"accept"===this.confirmation.defaultFocus},autoFocusReject(){return"reject"===this.confirmation.defaultFocus},closeOnEscape(){return!this.confirmation||this.confirmation.closeOnEscape}},components:{CDialog:n(i).default,CDButton:c.default}};const r={class:"p-confirm-dialog-message"};return a.render=function(e,o,i,n,c,s){const a=t.resolveComponent("CDButton"),l=t.resolveComponent("CDialog");return t.openBlock(),t.createBlock(l,{visible:c.visible,"onUpdate:visible":[o[2]||(o[2]=e=>c.visible=e),s.onHide],role:"alertdialog",class:"p-confirm-dialog",modal:!0,header:s.header,blockScroll:s.blockScroll,position:s.position,breakpoints:i.breakpoints,closeOnEscape:s.closeOnEscape},{footer:t.withCtx((()=>[t.createVNode(a,{label:s.rejectLabel,icon:s.rejectIcon,class:t.normalizeClass(s.rejectClass),onClick:o[0]||(o[0]=e=>s.reject()),autofocus:s.autoFocusReject},null,8,["label","icon","class","autofocus"]),t.createVNode(a,{label:s.acceptLabel,icon:s.acceptIcon,class:t.normalizeClass(s.acceptClass),onClick:o[1]||(o[1]=e=>s.accept()),autofocus:s.autoFocusAccept},null,8,["label","icon","class","autofocus"])])),default:t.withCtx((()=>[e.$slots.message?(t.openBlock(),t.createBlock(t.resolveDynamicComponent(e.$slots.message),{key:1,message:c.confirmation},null,8,["message"])):(t.openBlock(),t.createElementBlock(t.Fragment,{key:0},[t.createElementVNode("i",{class:t.normalizeClass(s.iconClass)},null,2),t.createElementVNode("span",r,t.toDisplayString(s.message),1)],64))])),_:1},8,["visible","header","blockScroll","position","breakpoints","closeOnEscape","onUpdate:visible"])},a}(primevue.button,primevue.confirmationeventbus,primevue.dialog,Vue);