@bitpoolos/edge-bacnet 1.6.3 → 1.6.5

package/bacnet_read.html

@@ -131,10 +131,7 @@
           getData(initial) {
             let app = this;
             this.nodeService.getNetworkData().then(function (result) {
-              //remove after below fixed
               app.devices = result.renderList;
-              //end remove
-
               app.deviceList = result.deviceList;
               app.pointList = result.pointList;
               app.pollFrequency = parseInt(result.pollFrequency);
@@ -665,21 +662,24 @@
               // Find the device in the device list
               let device = app.getDeviceFromDeviceList(mstpDevice.ipAddr, mstpDevice.deviceId);
               if (device) {
-                app.nodeService.updatePointsForDevice(device).then(function (result) {
-                  updatedCount++;
-                }).catch(function (error) {
-                  // Handle error silently
-                });
+                app.nodeService
+                  .updatePointsForDevice(device)
+                  .then(function (result) {
+                    updatedCount++;
+                  })
+                  .catch(function (error) {
+                    // Handle error silently
+                  });
               }
             });
 
             // Show user feedback
             if (mstpDevices.length > 0) {
               app.$toast?.add({
-                severity: 'info',
-                summary: 'Update Started',
+                severity: "info",
+                summary: "Update Started",
                 detail: `Updating points for ${mstpDevices.length} devices in ${slotProps.node.label}`,
-                life: 3000
+                life: 3000,
               });
             }
           },
@@ -687,14 +687,14 @@
             let app = this;
             let device = app.getDeviceFromDeviceList(slotProps.node.ipAddr, slotProps.node.deviceId);
             if (device) {
-              app.nodeService.purgeDevice(device).then(function (result) { });
+              app.nodeService.purgeDevice(device).then(function (result) {});
             }
           },
           updatePointsForDevice(slotProps) {
             let app = this;
             let device = app.getDeviceFromDeviceList(slotProps.node.ipAddr, slotProps.node.deviceId);
             if (device) {
-              app.nodeService.updatePointsForDevice(device).then(function (result) { });
+              app.nodeService.updatePointsForDevice(device).then(function (result) {});
             }
           },
           updatePoint(slotProps) {
@@ -705,7 +705,7 @@
             });
             const deviceKey = `${app.getDeviceAddress(device.address)}-${device.deviceId}`;
             if (device) {
-              app.nodeService.updatePoint(deviceKey, pointKey).then(function (result) { });
+              app.nodeService.updatePoint(deviceKey, pointKey).then(function (result) {});
             }
           },
           setDeviceName() {
@@ -765,27 +765,26 @@
           // NEW: Update display name in main devices tree
           updatePointDisplayNameInDevicesTree(deviceKey, pointName, newDisplayName) {
             let app = this;
-            let [ipAddress, deviceId] = deviceKey.split('-');
+            let [ipAddress, deviceId] = deviceKey.split("-");
 
             // Find the device in main tree
-            let deviceIndex = app.devices ? app.devices.findIndex(device =>
-              device.ipAddr === ipAddress && device.deviceId.toString() === deviceId) : -1;
+            let deviceIndex = app.devices
+              ? app.devices.findIndex((device) => device.ipAddr === ipAddress && device.deviceId.toString() === deviceId)
+              : -1;
 
             if (deviceIndex !== -1) {
               // Update direct device points
-              let pointIndex = app.devices[deviceIndex].children[0].children.findIndex(point =>
-                point.pointName === pointName);
+              let pointIndex = app.devices[deviceIndex].children[0].children.findIndex((point) => point.pointName === pointName);
               if (pointIndex !== -1) {
                 app.devices[deviceIndex].children[0].children[pointIndex].label = newDisplayName;
               }
 
               // Update MSTP device points if applicable
-              app.devices[deviceIndex].children.forEach(child => {
+              app.devices[deviceIndex].children.forEach((child) => {
                 if (child.label && child.label.includes("MSTP") && child.children) {
-                  child.children.forEach(mstpDevice => {
+                  child.children.forEach((mstpDevice) => {
                     if (mstpDevice.deviceId.toString() === deviceId) {
-                      let mstpPointIndex = mstpDevice.children[0].children.findIndex(point =>
-                        point.pointName === pointName);
+                      let mstpPointIndex = mstpDevice.children[0].children.findIndex((point) => point.pointName === pointName);
                       if (mstpPointIndex !== -1) {
                         mstpDevice.children[0].children[mstpPointIndex].label = newDisplayName;
                       }
@@ -798,17 +797,17 @@
           // NEW: Update display name in read devices tree
           updatePointDisplayNameInReadDevicesTree(deviceKey, pointName, newDisplayName) {
             let app = this;
-            let [ipAddress, deviceId] = deviceKey.split('-');
+            let [ipAddress, deviceId] = deviceKey.split("-");
 
             if (!app.readDevices) return;
 
             // Find the device in read devices tree
-            let readDeviceIndex = app.readDevices.findIndex(device =>
-              device.deviceId.toString() === deviceId);
+            let readDeviceIndex = app.readDevices.findIndex((device) => device.deviceId.toString() === deviceId);
 
             if (readDeviceIndex !== -1) {
-              let pointIndex = app.readDevices[readDeviceIndex].children[0].children.findIndex(point =>
-                point.pointName === pointName);
+              let pointIndex = app.readDevices[readDeviceIndex].children[0].children.findIndex(
+                (point) => point.pointName === pointName
+              );
               if (pointIndex !== -1) {
                 app.readDevices[readDeviceIndex].children[0].children[pointIndex].label = newDisplayName;
               }
@@ -1097,7 +1096,6 @@
             let count = 0;
             return count;
           },
-
         },
         components: {
           "p-tree": primevue.tree,
@@ -1399,7 +1397,6 @@
             filterMode="lenient"
             filterPlaceholder="No results found."
             v-if="hasData()">
-
             <template #device="slotProps">
               <div @contextmenu="onDeviceRightClick(slotProps, $event)" class="p-treenode-label">
                 <div v-if="isDeviceActive(slotProps)" class="deviceLabelParent">
@@ -1439,13 +1436,12 @@
               </div>
             </template>
 
-            
             <template #mstpfolder="slotProps">
               <div @contextmenu="onMstpFolderRightClick(slotProps, $event)" class="p-treenode-label">
                 <div class="deviceLabelParent">
                   <b class="mstpLabel">
                     <span>{{slotProps.node.label}}</span>
-                    <span class="mstpDeviceCount" >
+                    <span class="mstpDeviceCount">
                       &nbsp; {{slotProps.node.children ? slotProps.node.children.length : 0}} &nbsp;
                     </span>
                   </b>
@@ -1473,7 +1469,6 @@
                 </button>
               </div>
             </template>
-
           </p-tree>
           <div v-else style="text-align: center; padding-top: 20px;">
             <a>Building Tree...</a>
@@ -1713,4 +1708,4 @@
     <li><a href="https://wiki.bitpool.com/">wiki.bitpool.com</a> - find more documentation.</li>
     <li><a href="https://bacnet.org/">BACnet</a> - find more about the protocol.</li>
   </ul>
-</script>
+</script>

package/common.js

@@ -4,6 +4,7 @@
 
 const { randomUUID } = require("crypto");
 const os = require("os");
+const path = require("path");
 const baEnum = require("./resources/node-bacstack-ts/dist/index.js").enum;
 const fs = require("fs");
 const fs2 = require("fs").promises;
@@ -189,27 +190,16 @@ const roundDecimalPlaces = function (value, decimals) {
   return value;
 };
 
-// STORE CONFIG FUNCTION ==========================================================
-//
-// ================================================================================
-
-/*
-
-async function Store_Config(data) {
-  try {
-    await fs.writeFile("edge-bacnet-datastore.cfg", data, { encoding: "utf8", flag: "w" }, (err) => {
-      if (err) {
-        console.log("Store_Config writeFile error: ", err);
-      }
-    });
-  } catch (e) {
-    //do nothing
+const getStoragePath = (fileName) => {
+  const storagePath = process.env.BACNET_STORAGE_PATH;
+  if (storagePath) {
+    if (!fs.existsSync(storagePath)) {
+      fs.mkdirSync(storagePath, { recursive: true });
+    }
+    return path.join(storagePath, fileName);
   }
-}
-
-*/
-
-// refactor:
+  return fileName;
+};
 
 let storeQueue = [];
 let isStoreProcessing = false;
@@ -235,9 +225,9 @@ async function queueConfigStore(data) {
 }
 
 async function Store_Config(data) {
-  const mainFile = "edge-bacnet-datastore.cfg";
-  const tempFile = "edge-bacnet-datastore.cfg.tmp";
-  const backupFile = "edge-bacnet-datastore.cfg.bak";
+  const mainFile = getStoragePath("edge-bacnet-datastore.cfg");
+  const tempFile = getStoragePath("edge-bacnet-datastore.cfg.tmp");
+  const backupFile = getStoragePath("edge-bacnet-datastore.cfg.bak");
 
   try {
     // First validate the JSON to ensure it's valid before writing
@@ -295,54 +285,10 @@ async function Store_Config(data) {
   }
 }
 
-// READ CONFIG SYNC FUNCTION ======================================================
-//
-// ================================================================================
-
-function Read_Config_Sync() {
-  const mainFile = "edge-bacnet-datastore.cfg";
-  const backupFile = "edge-bacnet-datastore.cfg.bak";
-  const defaultData = "{}";
-
-  try {
-    // Try to read the main file
-    let data = fsSync.readFileSync(mainFile, { encoding: "utf8" });
-
-    // Validate JSON
-    try {
-      JSON.parse(data);
-      return data;
-    } catch (jsonError) {
-      console.error("Main file contains invalid JSON, attempting backup recovery");
-
-      // Try to read backup file
-      try {
-        const backupData = fsSync.readFileSync(backupFile, { encoding: "utf8" });
-        JSON.parse(backupData); // Validate backup JSON
-
-        // Restore from backup
-        fsSync.copyFileSync(backupFile, mainFile);
-        console.log("Successfully restored from backup file");
-        return backupData;
-      } catch (backupError) {
-        console.error("Backup recovery failed, creating new file");
-        fsSync.writeFileSync(mainFile, defaultData, { encoding: "utf8" });
-        return defaultData;
-      }
-    }
-  } catch (error) {
-    console.error("Error reading config:", error);
-    fsSync.writeFileSync(mainFile, defaultData, { encoding: "utf8" });
-    return defaultData;
-  }
-}
-
-// refactor:
-
 async function Read_Config_Async() {
   // todo rename function, not using sync
-  const mainFile = "edge-bacnet-datastore.cfg";
-  const backupFile = "edge-bacnet-datastore.cfg.bak";
+  const mainFile = getStoragePath("edge-bacnet-datastore.cfg");
+  const backupFile = getStoragePath("edge-bacnet-datastore.cfg.bak");
   const defaultData = "{}";
 
   try {
@@ -366,15 +312,11 @@ async function Read_Config_Async() {
         await fs.copyFile(backupFile, mainFile);
         console.log("Successfully restored from backup file");
 
-        console.log("log2");
-
         return backupData;
       } catch (backupError) {
         console.error("Backup recovery failed, creating new file");
         await Store_Config(defaultData);
 
-        console.log("log3");
-
         return defaultData;
       }
     }
@@ -382,8 +324,6 @@ async function Read_Config_Async() {
     console.error("Error reading config:", error);
     await Store_Config(defaultData);
 
-    console.log("log4");
-
     return defaultData;
   }
 }
@@ -393,7 +333,7 @@ async function Read_Config_Async() {
 // ================================================================================
 async function Store_Config_Server(data) {
   try {
-    await fs.writeFile("edge-bacnet-server-datastore.cfg", data, (err) => {
+    await fs.writeFile(getStoragePath("edge-bacnet-server-datastore.cfg"), data, (err) => {
       if (err) {
         //console.log("Store_Config_Server writeFile error: ", err);
       }
@@ -407,7 +347,7 @@ async function Store_Config_Server(data) {
 function Read_Config_Sync_Server() {
   var data = "{}";
   try {
-    data = fs.readFileSync("edge-bacnet-server-datastore.cfg", { encoding: "utf8", flag: "r" });
+    data = fs.readFileSync(getStoragePath("edge-bacnet-server-datastore.cfg"), { encoding: "utf8", flag: "r" });
   } catch (err) {
     if (err.errno == -4058) {
       data = "{}";
@@ -485,7 +425,6 @@ module.exports = {
   roundDecimalPlaces,
   queueConfigStore,
   Store_Config,
-  Read_Config_Sync,
   Read_Config_Async,
   Store_Config_Server,
   Read_Config_Sync_Server,

package/package.json

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

package/resources/node-bacstack-ts/dist/lib/client.js

@@ -67,9 +67,23 @@ class Client extends events_1.EventEmitter {
     }
     // Helper utils
     _getInvokeId() {
+        // Try up to 256 times to find an unused invoke ID
+        for (let attempts = 0; attempts < 256; attempts++) {
+            const id = this._invokeCounter++;
+            if (id >= 256) this._invokeCounter = 1;
+
+            const invokeId = id - 1;
+
+            // If this invoke ID is not currently in use, return it
+            if (!this._invokeStore[invokeId]) {
+                return invokeId;
+            }
+        }
+
+        // Edge case: if all 256 invoke IDs are in use, fall back to original behavior
+        // This prevents infinite loops while maintaining backwards compatibility
         const id = this._invokeCounter++;
-        if (id >= 256)
-            this._invokeCounter = 1;
+        if (id >= 256) this._invokeCounter = 1;
         return id - 1;
     }
     _invokeCallback(id, err, result) {