@bitpoolos/edge-bacnet 1.2.7 → 1.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bacnet_client.js +1849 -1591
- package/bacnet_gateway.html +28 -0
- package/bacnet_gateway.js +4 -2
- package/bacnet_write.html +732 -743
- package/common.js +19 -25
- package/package.json +2 -2
package/common.js
CHANGED
|
@@ -92,7 +92,8 @@ class BacnetClientConfig {
|
|
|
92
92
|
manual_instance_range_end,
|
|
93
93
|
device_read_schedule,
|
|
94
94
|
retries,
|
|
95
|
-
cacheFileEnabled
|
|
95
|
+
cacheFileEnabled,
|
|
96
|
+
sanitise_device_schedule
|
|
96
97
|
) {
|
|
97
98
|
this.apduTimeout = apduTimeout;
|
|
98
99
|
this.localIpAdrress = localIpAdrress;
|
|
@@ -109,6 +110,7 @@ class BacnetClientConfig {
|
|
|
109
110
|
this.device_read_schedule = device_read_schedule;
|
|
110
111
|
this.retries = retries;
|
|
111
112
|
this.cacheFileEnabled = cacheFileEnabled;
|
|
113
|
+
this.sanitise_device_schedule = sanitise_device_schedule;
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
116
|
|
|
@@ -222,25 +224,17 @@ const doNodeRedRestart = function () {
|
|
|
222
224
|
// STORE CONFIG FUNCTION ==========================================================
|
|
223
225
|
//
|
|
224
226
|
// ================================================================================
|
|
225
|
-
function Store_Config(data) {
|
|
227
|
+
async function Store_Config(data) {
|
|
226
228
|
try {
|
|
227
|
-
fs.
|
|
228
|
-
if(err){
|
|
229
|
-
console.log("Store_Config
|
|
230
|
-
} else {
|
|
231
|
-
await fs.writeFile("edge-bacnet-datastore.cfg", data, {encoding: "utf8", flag: "w"}, (err) => {
|
|
232
|
-
if (err) {
|
|
233
|
-
console.log("Store_Config writeFile error: ", err);
|
|
234
|
-
}
|
|
235
|
-
});
|
|
229
|
+
await fs.writeFile("edge-bacnet-datastore.cfg", data, { encoding: "utf8", flag: "w" }, (err) => {
|
|
230
|
+
if (err) {
|
|
231
|
+
console.log("Store_Config writeFile error: ", err);
|
|
236
232
|
}
|
|
237
233
|
});
|
|
238
|
-
} catch(e){
|
|
234
|
+
} catch (e) {
|
|
239
235
|
//do nothing
|
|
240
236
|
}
|
|
241
|
-
}
|
|
242
|
-
|
|
243
|
-
|
|
237
|
+
}
|
|
244
238
|
|
|
245
239
|
// READ CONFIG SYNC FUNCTION ======================================================
|
|
246
240
|
//
|
|
@@ -248,15 +242,14 @@ function Store_Config(data) {
|
|
|
248
242
|
function Read_Config_Sync() {
|
|
249
243
|
var data = "{}";
|
|
250
244
|
try {
|
|
251
|
-
data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding:
|
|
252
|
-
}
|
|
253
|
-
catch (err) {
|
|
245
|
+
data = fs.readFileSync("edge-bacnet-datastore.cfg", { encoding: "utf8", flag: "r" });
|
|
246
|
+
} catch (err) {
|
|
254
247
|
console.log("Read_Config_Sync error:", err);
|
|
255
|
-
data =
|
|
248
|
+
data = "{}";
|
|
256
249
|
Store_Config(data);
|
|
257
250
|
}
|
|
258
251
|
return data;
|
|
259
|
-
}
|
|
252
|
+
}
|
|
260
253
|
|
|
261
254
|
// STORE CONFIG FUNCTION - BACNET SERVER ==========================================
|
|
262
255
|
//
|
|
@@ -279,16 +272,17 @@ function Read_Config_Sync_Server() {
|
|
|
279
272
|
try {
|
|
280
273
|
data = fs.readFileSync("edge-bacnet-server-datastore.cfg", { encoding: "utf8", flag: "r" });
|
|
281
274
|
} catch (err) {
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
275
|
+
if (err.errno == -4058) {
|
|
276
|
+
console.log("Edge-BACnet Server: No save file found, creating new file");
|
|
277
|
+
data = "{}";
|
|
278
|
+
Store_Config_Server(data);
|
|
279
|
+
}
|
|
286
280
|
}
|
|
287
281
|
return data;
|
|
288
282
|
}
|
|
289
283
|
|
|
290
284
|
function isNumber(value) {
|
|
291
|
-
return value != null && typeof value ===
|
|
285
|
+
return value != null && typeof value === "number" && !isNaN(value);
|
|
292
286
|
}
|
|
293
287
|
|
|
294
288
|
module.exports = {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bitpoolos/edge-bacnet",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.8",
|
|
4
4
|
"description": "A bacnet gateway for node-red",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@plus4nodered/ts-node-bacnet": "^1.0.0-beta.2",
|
|
@@ -50,4 +50,4 @@
|
|
|
50
50
|
"type": "github",
|
|
51
51
|
"url": "git+https://github.com/bitpool/edge-bacnet.git"
|
|
52
52
|
}
|
|
53
|
-
}
|
|
53
|
+
}
|