smithtek-mako-rf 2.9.7 → 2.9.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smithtek-mako-rf",
-  "version": "2.9.7",
+  "version": "2.9.10",
   "description": "Smithtek dedicated node for communicating with the Mako PLC over RS485 or RF",
   "keywords": [
     "node-red",

package/smithtek-mako-rf.js

@@ -117,7 +117,9 @@ module.exports = function (RED) {
           try { port.removeListener("data", onData); } catch (_e2) {}
         }
         try { if (typeof port.flush === "function") port.flush(() => {}); } catch (_e) {}
+        if (state._rssiCleanup === cleanup) delete state._rssiCleanup;
       }
+state._rssiCleanup = cleanup;
 
       function onData(chunk) {
         rx = Buffer.concat([rx, Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)]);
@@ -225,7 +227,16 @@ module.exports = function (RED) {
     const regIndex = Math.floor(byteOffset / 2);
 
     const w = (i) => (regs[i] & 0xffff);
+    const isBoolArray = (Array.isArray(regs) && typeof regs[0] === "boolean");
 
+    function coilWord(wordIndex) {
+      let out = 0;
+      const base = wordIndex * 16;
+      for (let b = 0; b < 16; b++) {
+        if (regs[base + b]) out |= (1 << b);
+      }
+      return out >>> 0;
+    }
     // 4 bytes from two 16-bit words in common Modbus orders
     function bytesABCD(a, b) {
       return Buffer.from([(a >> 8) & 0xff, a & 0xff, (b >> 8) & 0xff, b & 0xff]);
@@ -300,12 +311,25 @@ module.exports = function (RED) {
         return buf.readFloatBE(0);
       }
 
-      case "digital to unsigned binary encoder":
-        return w(regIndex) >>> 0;
+      case "digital to unsigned binary encoder": {
+        const word = w(regIndex) >>> 0;
+
+        // If the UI provided a bit (0–15), return that bit as TRUE/FALSE
+        const bit = clampInt(offsetBit, 0, 15, 0);
+        return ((word >> bit) & 1) === 1;
+      }
+
 
-      // optional internal bool support
       case "bool": {
         const bit = clampInt(offsetBit, 0, 15, 0);
+
+        // If this is FC1/FC2 data (boolean array), read bit directly
+        if (isBoolArray) {
+          const idx = (regIndex * 16) + bit;
+          return !!regs[idx];
+        }
+
+        // Otherwise treat as 16-bit register
         return ((w(regIndex) >> bit) & 1) === 1;
       }
 
@@ -498,6 +522,7 @@ module.exports = function (RED) {
     state.busy = true;
 
     (async () => {
+        await sleep(20);
       while (state.queue.length > 0) {
         const item = state.queue.shift();
         const { node, msg, send, done, req, items } = item;
@@ -548,8 +573,9 @@ module.exports = function (RED) {
             // Force reconnect next attempt
             state.connected = false;
             try {
-              state.client.close(() => {});
-            } catch (_e) {}
+      await new Promise((resolve) => state.client.close(() => resolve()));
+    } catch (_e) {}
+
 
             if (attempt < totalTries && gap_s > 0) {
               await sleep(Math.floor(gap_s * 1000));
@@ -598,8 +624,12 @@ module.exports = function (RED) {
 
 
             const rssiDbm = await queryRssiOnSamePort(state, guardMs, timeoutMs);
+            await sleep(30);
             state.connected = false;
-            try { state.client.close(() => {}); } catch (_e) {}
+try {
+  await new Promise((resolve) => state.client.close(() => resolve()));
+} catch (_e) {}
+
 
 
             const nodeKeyBase = sanitizeKey(node.name || busName || "mako_rf");
@@ -652,6 +682,7 @@ module.exports = function (RED) {
     this.gap_s = toNum(n.gap_s, 0);
     this.maxQueue = toNum(n.maxQueue, 50);
 
+    BUS.delete(this.id);
     ensureBusState(this);
 
     this.on("close", (removed, done) => {
@@ -769,9 +800,32 @@ module.exports = function (RED) {
     });
 
     node.on("close", function (_removed, done) {
+      try {
+        const busCfg = RED.nodes.getNode(config.bus);
+        if (busCfg) {
+          const s = BUS.get(busCfg.id);
+          if (s) {
+            // NEW: stop any in-flight queue processor from the old deploy
+            s.queue = [];
+            s.busy = false;
+
+            if (typeof s._rssiCleanup === "function") {
+              try { s._rssiCleanup(); } catch (_e) {}
+            }
+            if (s.client) {
+              try { s.client.close(() => {}); } catch (_e) {}
+              s.connected = false;
+              s.client = new (require("modbus-serial"))();
+            }
+          }
+        }
+      } catch (_e) {}
+
       node.status({});
       done();
     });
+
+
   }
 
   RED.nodes.registerType("smithtek-mako-rf", SmithtekMakoRfNode);