smithtek-mako-rf 3.4.1 → 3.5.1

package/smithtek-mako-rf.js

@@ -386,6 +386,7 @@ function toNum(v, fallback) {
     const code = err.code || (err.modbusCode ? 'MODBUS_EXCEPTION_'+err.modbusCode : 'ECOMM');
     const message = String(err.message || err);
     const labels = {ECONFIG:'Configuration error',EDECODE:'Decode error',EQUEUEFULL:'Queue full',
+      EBUSRESET:'Bus queue reset',EBUSRECOVERING:'Bus recovering',EBUSRECOVERYFAILED:'Bus recovery failed',
       EQUEUEEXPIRED:'Queue expired',EOFFLINE:'Offline',EPORTBUSY:'Port busy',ECLOSE:'Serial close failure',
       EDISCONNECT:'Serial disconnected',EIO:'Serial error',ENOENT:'Serial port unavailable',EACCES:'Serial permission denied'};
     let reason = labels[code];
@@ -405,6 +406,9 @@ function toNum(v, fallback) {
       'Configuration error':'Setup error — check node settings',
       'Decode error':'Data format error — check register map/scaling',
       'Queue full':'Polling overloaded — reduce polling rate',
+      'Bus queue reset':'Requests cancelled — reduce polling rate; verify any write before repeating',
+      'Bus recovering':'Connection restarting — wait before sending new requests',
+      'Bus recovery failed':'Recovery stopped — check connection and redeploy',
       'Queue expired':'Polling delayed — reduce polling rate',
       'Offline':'Polling paused — check device availability',
       'Port busy':'Bus in use — check duplicate bus settings',
@@ -453,6 +457,7 @@ function toNum(v, fallback) {
             msg.modbus.error = fault.message;
             msg.modbus.code = fault.code;
             msg.modbus.fault = fault;
+            msg.modbus.writeMayHaveApplied = !!failure.writeMayHaveApplied;
             msg.payload = {[fault.key]:1};
             node.status({fill:failure.code === 'EOFFLINE' ? 'yellow' : 'red',shape:'ring',text:fault.message});
           } else {
@@ -463,7 +468,7 @@ function toNum(v, fallback) {
           // Cloud output always carries either decoded data or the friendly alarm.
           // The second output contains a separate technical error payload.
           const debugMsg = failure ? Object.assign({}, msg, {
-            payload: {ok:false,error:msg.modbus.error,code:msg.modbus.code,req},
+            payload: {ok:false,error:msg.modbus.error,code:msg.modbus.code,req,writeMayHaveApplied:msg.modbus.writeMayHaveApplied},
             modbus: Object.assign({}, msg.modbus)
           }) : null;
           send([msg, debugMsg]);
@@ -483,7 +488,7 @@ function toNum(v, fallback) {
         engine.enqueue(state,{node,req,complete,after: async () => {
           if(cfg.appendRssi && cfg.serialPort === '/dev/ttyAMA2' && req.mode === 'read') {
             try {msg._makoRssi = await engine.rssi(state,buildRssiCommandBuffer,tryParseRssiAck);}
-            catch(e){if(e.code === 'ECANCELLED')throw e;msg.rssi_error=e.message;}
+            catch(e){if(['ECANCELLED','EBUSRESET','EBUSRECOVERING','EBUSRECOVERYFAILED'].includes(e.code))throw e;msg.rssi_error=e.message;}
           }
         }});
       }catch(err){if(!err.code) err.code='ECONFIG';complete(err);}