smithtek-mako-rf 3.0.1 → 3.0.3

package/package.json

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

package/smithtek-mako-rf.js

@@ -411,25 +411,37 @@ state._rssiCleanup = cleanup;
     return [5, 6, 15, 16].includes(fc) ? fc : 5;
   }
 
+  async function closeClientSafe(state) {
+    // Best-effort: close and wait a moment for the fd to actually drop
+    try {
+      await new Promise((resolve) => {
+        try {
+          state.client.close(() => resolve());
+        } catch (_e) {
+          resolve();
+        }
+      });
+    } catch (_e) {}
+
+    // tiny settle time helps on Pi serial
+    await sleep(50);
+  }
+
   async function connectIfNeeded(cfg, state) {
     if (!cfg) throw new Error("Bus config missing");
 
-    // NOTE: we will hard-lock /dev/ttyAMA2 later (PassPort mode)
-    // if (process.env.SMITHTEK_PASSPORT === "1") cfg.serialPort = "/dev/ttyAMA2";
-
     const portKey = makePortKey(cfg);
 
-    // If port settings changed, force reconnect
+    // If settings changed, force reconnect
     if (state.connected && state.lastPortKey !== portKey) {
       state.connected = false;
-      try {
-        state.client.close(() => {});
-      } catch (_e) {}
+      await closeClientSafe(state);
     }
 
+    // Already connected
     if (state.connected) return;
 
-    // If another request is already connecting, wait for it
+    // If already connecting, wait for that attempt to finish
     if (state.connecting) {
       for (let i = 0; i < 200; i++) {
         if (state.connected) return;
@@ -451,10 +463,10 @@ state._rssiCleanup = cleanup;
         parity: cfg.parity || "none",
       };
 
-      try {
-        state.client.close(() => {});
-      } catch (_e) {}
+      // Always close cleanly before opening (and WAIT for it)
+      await closeClientSafe(state);
 
+      // Open
       await state.client.connectRTUBuffered(port, options);
 
       // UI uses seconds; library uses ms
@@ -564,12 +576,7 @@ state._rssiCleanup = cleanup;
           } catch (err) {
             lastErr = err;
 
-            // Force reconnect next attempt
-            state.connected = false;
-            try {
-      await new Promise((resolve) => state.client.close(() => resolve()));
-    } catch (_e) {}
-
+            node.warn(`${busName}: RF error fc${req.fc} uid${req.unitid} try ${attempt}/${totalTries}: ${err.message || err}`);
 
             if (attempt < totalTries && gap_s > 0) {
               await sleep(Math.floor(gap_s * 1000));
@@ -799,18 +806,15 @@ try {
         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"))();
-            }
+
+            s.connected = false;
+            try { s.client.close(() => {}); } catch (_e) {}
           }
         }
       } catch (_e) {}