smithtek-mako-rf 3.0.2 → 3.1.0

package/package.json

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

package/smithtek-mako-rf.js

@@ -426,25 +426,41 @@ state._rssiCleanup = cleanup;
     // tiny settle time helps on Pi serial
     await sleep(50);
   }
-
   async function connectIfNeeded(cfg, state) {
     if (!cfg) throw new Error("Bus config missing");
 
     const portKey = makePortKey(cfg);
 
-    // If settings changed, force reconnect
-    if (state.connected && state.lastPortKey !== portKey) {
+    // If serial settings have actually changed, reconnect.
+    if (state.lastPortKey && state.lastPortKey !== portKey) {
       state.connected = false;
-      await closeClientSafe(state);
+
+      if (state.client.isOpen) {
+        await closeClientSafe(state);
+      }
+    }
+
+    // Trust the actual modbus-serial port state.
+    // If the serial port is already open, reuse it.
+    if (state.client.isOpen) {
+      state.connected = true;
+      state.lastPortKey = portKey;
+      return;
     }
 
-    // Already connected
-    if (state.connected) return;
+    if (state.connected) {
+      state.connected = false;
+    }
 
-    // If already connecting, wait for that attempt to finish
+    // If another request is already opening the port, wait.
     if (state.connecting) {
       for (let i = 0; i < 200; i++) {
-        if (state.connected) return;
+        if (state.client.isOpen) {
+          state.connected = true;
+          state.lastPortKey = portKey;
+          return;
+        }
+
         if (!state.connecting) break;
         await sleep(50);
       }
@@ -463,23 +479,35 @@ state._rssiCleanup = cleanup;
         parity: cfg.parity || "none",
       };
 
-      // Always close cleanly before opening (and WAIT for it)
-      await closeClientSafe(state);
+      // Only close if the library says the port is actually open.
+      if (state.client.isOpen) {
+        await closeClientSafe(state);
+      }
+
+      // Allow Linux/serialport time to release any previous lock.
+      await sleep(200);
 
-      // Open
       await state.client.connectRTUBuffered(port, options);
 
-      // UI uses seconds; library uses ms
+      // UI uses seconds; library uses milliseconds.
       const timeout_s = Math.max(1, toNum(cfg.timeout_s, 8));
-      state.client.setTimeout(Math.max(1000, Math.floor(timeout_s * 1000)));
+      state.client.setTimeout(
+        Math.max(1000, Math.floor(timeout_s * 1000))
+      );
 
       state.connected = true;
       state.lastPortKey = portKey;
+
+    } catch (err) {
+      state.connected = false;
+      throw err;
+
     } finally {
       state.connecting = false;
     }
   }
 
+
   async function doRequest(cfg, state, req) {
     await connectIfNeeded(cfg, state);
 
@@ -576,12 +604,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));