node-red-contrib-modbus - npm Package Compare versions

Comparing version 5.5.0-beta.0 to 5.5.0-beta.1

CHANGELOG.md

@@ -5,2 +5,9 @@ # Changelog
 
+## [5.5.0-beta.1](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.5.0-beta.0...v5.5.0-beta.1) (2020-03-31)
+
+
+### Bug Fixes
+
+* testing works with new flaqs and clean code ([65dba5e](https://github.com/biancoroyal/node-red-contrib-modbus/commit/65dba5e744030221c006ce249499e340fafed7a4))
+
 ## [5.5.0-beta.0](https://github.com/biancoroyal/node-red-contrib-modbus/compare/v5.4.1-beta.1...v5.5.0-beta.0) (2020-03-30)
@@ -7,0 +14,0 @@

modbus/core/modbus-client-core.js

@@ -1,2 +0,2 @@
-"use strict";require("source-map-support").install();var de=de||{biancoroyal:{modbus:{core:{client:{}}}}};de.biancoroyal.modbus.core.client.internalDebug=de.biancoroyal.modbus.core.client.internalDebug||require("debug")("contribModbus:core:client"),de.biancoroyal.modbus.core.client.internalDebugFSM=de.biancoroyal.modbus.core.client.internalDebugFSM||require("debug")("contribModbus:core:client:fsm"),de.biancoroyal.modbus.core.client.modbusSerialDebug=de.biancoroyal.modbus.core.client.modbusSerialDebug||require("debug")("modbus-serial"),de.biancoroyal.modbus.core.client.XStateFSM=de.biancoroyal.modbus.core.client.XStateFSM||require("@xstate/fsm"),de.biancoroyal.modbus.core.client.stateLogEnabled=de.biancoroyal.modbus.core.client.stateLogEnabled||!1,de.biancoroyal.modbus.core.client.networkErrors=["ESOCKETTIMEDOUT","ETIMEDOUT","ECONNRESET","ENETRESET","ECONNABORTED","ECONNREFUSED","ENETUNREACH","ENOTCONN","ESHUTDOWN","EHOSTDOWN","ENETDOWN","EWOULDBLOCK","EAGAIN","EHOSTUNREACH"],de.biancoroyal.modbus.core.client.createStateMachineService=function(){return this.stateLogEnabled=!1,this.XStateFSM.createMachine({id:"modbus",initial:"new",states:{new:{on:{INIT:"init",BREAK:"broken",STOP:"stopped"}},broken:{on:{INIT:"init",STOP:"stopped",FAILURE:"failed",ACTIVATE:"activated",RECONNECT:"reconnecting"}},reconnecting:{on:{INIT:"init",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},init:{on:{OPENSERIAL:"opened",CONNECT:"connected",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},opened:{on:{CONNECT:"connected",BREAK:"broken",FAILURE:"failed",CLOSE:"closed",STOP:"stopped"}},connected:{on:{CLOSE:"closed",ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},activated:{on:{READ:"reading",WRITE:"writing",QUEUE:"queueing",BREAK:"broken",CLOSE:"closed",FAILURE:"failed",STOP:"stopped"}},queueing:{on:{ACTIVATE:"activated",READ:"reading",WRITE:"writing",EMPTY:"empty",BREAK:"broken",CLOSE:"closed",FAILURE:"failed",STOP:"stopped"}},empty:{on:{QUEUE:"queueing",BREAK:"broken",FAILURE:"failed",CLOSE:"closed",STOP:"stopped"}},reading:{on:{ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},writing:{on:{ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},closed:{on:{FAILURE:"failed",BREAK:"broken",CONNECT:"connected",RECONNECT:"reconnecting",INIT:"init",STOP:"stopped"}},failed:{on:{CLOSE:"closed",BREAK:"broken",STOP:"stopped"}},stopped:{on:{NEW:"new",STOP:"stopped"}}}})},de.biancoroyal.modbus.core.client.startStateService=function(e){return this.XStateFSM.interpret(e).start()},de.biancoroyal.modbus.core.client.checkUnitId=function(e,a){return"tcp"===a?0<=e&&e<=255:1<=e&&e<=247},de.biancoroyal.modbus.core.client.getLogFunction=function(e){return e.internalDebugLog?e.internalDebugLog:de.biancoroyal.modbus.core.client.internalDebug},de.biancoroyal.modbus.core.client.activateSendingOnSuccess=function(e,a,n,t,o){e.activateSending(o).then(function(){a(t,o)}).catch(function(e){n(e,o)})},de.biancoroyal.modbus.core.client.activateSendingOnFailure=function(e,a,n,t){e.activateSending(t).then(function(){a(n,t)}).catch(function(e){a(e,t)})},de.biancoroyal.modbus.core.client.readModbus=function(a,n,t,o){if(a.client){a.bufferCommands||a.stateService.send("READ"),a.setUnitIdFromPayload(n),a.client.setTimeout(a.clientTimeout);var i=de.biancoroyal.modbus.core.client,r=de.biancoroyal.modbus.core.client.getLogFunction(a);a.queueLog(JSON.stringify({info:"read msg",message:n.payload,unitid:n.queueUnitId,timeout:a.client.getTimeout(),state:a.actualServiceState.value}));try{switch(parseInt(n.payload.fc)){case 1:a.client.readCoils(parseInt(n.payload.address),parseInt(n.payload.quantity)).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;case 2:a.client.readDiscreteInputs(parseInt(n.payload.address),parseInt(n.payload.quantity)).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;case 3:a.client.readHoldingRegisters(parseInt(n.payload.address),parseInt(n.payload.quantity)).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;case 4:a.client.readInputRegisters(parseInt(n.payload.address),parseInt(n.payload.quantity)).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;default:i.activateSendingOnFailure(a,o,new Error("Function Code Unknown"),n),r("Function Code Unknown %s",n.payload.fc)}}catch(e){i.activateSendingOnFailure(a,o,e,n),r(e.message),a.modbusErrorHandling(e)}}},de.biancoroyal.modbus.core.client.writeModbus=function(a,n,t,o){if(a.client){a.bufferCommands||a.stateService.send("WRITE"),a.setUnitIdFromPayload(n),a.client.setTimeout(a.clientTimeout);var i=de.biancoroyal.modbus.core.client,r=de.biancoroyal.modbus.core.client.getLogFunction(a);a.queueLog(JSON.stringify({info:"write msg",message:n.payload,unitid:n.queueUnitId,timeout:a.client.getTimeout(),state:a.actualServiceState.value}));try{switch(parseInt(n.payload.fc)){case 15:parseInt(n.payload.value.length)!==parseInt(n.payload.quantity)?i.activateSendingOnFailure(a,o,new Error("Quantity should be less or equal to coil payload array length: "+n.payload.value.length+" Addr: "+n.payload.address+" Q: "+n.payload.quantity),n):a.client.writeCoils(parseInt(n.payload.address),n.payload.value).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){a.activateSending(n),o(e,n),a.modbusErrorHandling(e)});break;case 5:n.payload.value?n.payload.value=!0:n.payload.value=!1,a.client.writeCoil(parseInt(n.payload.address),n.payload.value).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;case 16:parseInt(n.payload.value.length)!==parseInt(n.payload.quantity)?i.activateSendingOnFailure(a,o,new Error("Quantity should be less or equal to register payload array length: "+n.payload.value.length+" Addr: "+n.payload.address+" Q: "+n.payload.quantity),n):a.client.writeRegisters(parseInt(n.payload.address),n.payload.value).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;case 6:a.client.writeRegister(parseInt(n.payload.address),parseInt(n.payload.value)).then(function(e){i.activateSendingOnSuccess(a,t,o,e,n)}).catch(function(e){i.activateSendingOnFailure(a,o,e,n),a.modbusErrorHandling(e)});break;default:i.activateSendingOnFailure(a,o,new Error("Function Code Unknown"),n),r("Function Code Unknown %s",n.payload.fc)}}catch(e){i.activateSendingOnFailure(a,o,e,n),r(e.message),a.modbusErrorHandling(e)}}},de.biancoroyal.modbus.core.client.setNewNodeSettings=function(e,a){var n=de.biancoroyal.modbus.core.client.getLogFunction(e);if(!a)return n("New Connection message invalid."),!1;switch(a.payload.connectorType.toUpperCase()){case"TCP":e.tcpHost=a.payload.tcpHost||e.tcpHost,e.tcpPort=a.payload.tcpPort||e.tcpPort,e.tcpType=a.payload.tcpType||e.tcpType,n("New Connection Data "+e.tcpHost+" "+e.tcpPort+" "+e.tcpType);break;case"SERIAL":a.payload.serialPort&&(e.serialPort=a.payload.serialPort||e.serialPort),a.payload.serialBaudrate&&(e.serialBaudrate=parseInt(a.payload.serialBaudrate)||e.serialBaudrate),e.serialDatabits=a.payload.serialDatabits||e.serialDatabits,e.serialStopbits=a.payload.serialStopbits||e.serialStopbits,e.serialParity=a.payload.serialParity||e.serialParity,e.serialType=a.payload.serialType||e.serialType,a.payload.serialConnectionDelay&&(e.serialConnectionDelay=parseInt(a.payload.serialConnectionDelay)||e.serialConnectionDelay),n("New Connection Data "+e.serialPort+" "+e.serialBaudrate+" "+e.serialType);break;default:n("Unknown Dynamic Reconnect Type "+a.payload.connectorType)}return a.payload.unitId&&(e.unit_id=parseInt(a.payload.unitId)||e.unit_id),a.payload.commandDelay&&(e.commandDelay=parseInt(a.payload.commandDelay)||e.commandDelay),a.payload.clientTimeout&&(e.clientTimeout=parseInt(a.payload.clientTimeout)||e.clientTimeout),a.payload.reconnectTimeout&&(e.reconnectTimeout=parseInt(a.payload.reconnectTimeout)||e.reconnectTimeout),!0},de.biancoroyal.modbus.core.client.messagesAllowedStates=["activated","queueing","empty"],module.exports=de.biancoroyal.modbus.core.client;
+"use strict";require("source-map-support").install();var de=de||{biancoroyal:{modbus:{core:{client:{}}}}};de.biancoroyal.modbus.core.client.internalDebug=de.biancoroyal.modbus.core.client.internalDebug||require("debug")("contribModbus:core:client"),de.biancoroyal.modbus.core.client.internalDebugFSM=de.biancoroyal.modbus.core.client.internalDebugFSM||require("debug")("contribModbus:core:client:fsm"),de.biancoroyal.modbus.core.client.modbusSerialDebug=de.biancoroyal.modbus.core.client.modbusSerialDebug||require("debug")("modbus-serial"),de.biancoroyal.modbus.core.client.XStateFSM=de.biancoroyal.modbus.core.client.XStateFSM||require("@xstate/fsm"),de.biancoroyal.modbus.core.client.stateLogEnabled=de.biancoroyal.modbus.core.client.stateLogEnabled||!1,de.biancoroyal.modbus.core.client.networkErrors=["ESOCKETTIMEDOUT","ETIMEDOUT","ECONNRESET","ENETRESET","ECONNABORTED","ECONNREFUSED","ENETUNREACH","ENOTCONN","ESHUTDOWN","EHOSTDOWN","ENETDOWN","EWOULDBLOCK","EAGAIN","EHOSTUNREACH"],de.biancoroyal.modbus.core.client.createStateMachineService=function(){return this.stateLogEnabled=!1,this.XStateFSM.createMachine({id:"modbus",initial:"new",states:{new:{on:{INIT:"init",BREAK:"broken",STOP:"stopped"}},broken:{on:{INIT:"init",STOP:"stopped",FAILURE:"failed",ACTIVATE:"activated",RECONNECT:"reconnecting"}},reconnecting:{on:{INIT:"init",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},init:{on:{OPENSERIAL:"opened",CONNECT:"connected",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},opened:{on:{CONNECT:"connected",BREAK:"broken",FAILURE:"failed",CLOSE:"closed",STOP:"stopped"}},connected:{on:{CLOSE:"closed",ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},activated:{on:{READ:"reading",WRITE:"writing",QUEUE:"queueing",BREAK:"broken",CLOSE:"closed",FAILURE:"failed",STOP:"stopped"}},queueing:{on:{ACTIVATE:"activated",READ:"reading",WRITE:"writing",EMPTY:"empty",BREAK:"broken",CLOSE:"closed",FAILURE:"failed",STOP:"stopped"}},empty:{on:{QUEUE:"queueing",BREAK:"broken",FAILURE:"failed",CLOSE:"closed",STOP:"stopped"}},reading:{on:{ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},writing:{on:{ACTIVATE:"activated",BREAK:"broken",FAILURE:"failed",STOP:"stopped"}},closed:{on:{FAILURE:"failed",BREAK:"broken",CONNECT:"connected",RECONNECT:"reconnecting",INIT:"init",STOP:"stopped"}},failed:{on:{CLOSE:"closed",BREAK:"broken",STOP:"stopped"}},stopped:{on:{NEW:"new",STOP:"stopped"}}}})},de.biancoroyal.modbus.core.client.startStateService=function(e){return this.XStateFSM.interpret(e).start()},de.biancoroyal.modbus.core.client.checkUnitId=function(e,n){return"tcp"===n?0<=e&&e<=255:1<=e&&e<=247},de.biancoroyal.modbus.core.client.getLogFunction=function(e){return e.internalDebugLog?e.internalDebugLog:de.biancoroyal.modbus.core.client.internalDebug},de.biancoroyal.modbus.core.client.activateSendingOnSuccess=function(e,n,o,a,t){e.activateSending(t).then(function(){n(a,t)}).catch(function(e){o(e,t)})},de.biancoroyal.modbus.core.client.activateSendingOnFailure=function(e,n,o,a){e.activateSending(a).then(function(){n(o,a)}).catch(function(e){n(e,a)})},de.biancoroyal.modbus.core.client.readModbusByFunctionCodeOne=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;n.client.readCoils(parseInt(o.payload.address),parseInt(o.payload.quantity)).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.readModbusByFunctionCodeTwo=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;n.client.readDiscreteInputs(parseInt(o.payload.address),parseInt(o.payload.quantity)).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.readModbusByFunctionCodeThree=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;n.client.readHoldingRegisters(parseInt(o.payload.address),parseInt(o.payload.quantity)).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.readModbusByFunctionCodeFour=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;n.client.readInputRegisters(parseInt(o.payload.address),parseInt(o.payload.quantity)).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.readModbusByFunctionCode=function(e,n,o,a){var t=de.biancoroyal.modbus.core.client,i=de.biancoroyal.modbus.core.client.getLogFunction(e);switch(parseInt(n.payload.fc)){case 1:t.readModbusByFunctionCodeOne(e,n,o,a);break;case 2:t.readModbusByFunctionCodeTwo(e,n,o,a);break;case 3:t.readModbusByFunctionCodeThree(e,n,o,a);break;case 4:t.readModbusByFunctionCodeFour(e,n,o,a);break;default:t.activateSendingOnFailure(e,a,new Error("Function Code Unknown"),n),i("Function Code Unknown %s",n.payload.fc)}},de.biancoroyal.modbus.core.client.readModbus=function(n,o,e,a){if(n.client){n.bufferCommands||n.stateService.send("READ"),n.setUnitIdFromPayload(o),n.client.setTimeout(n.clientTimeout);var t=de.biancoroyal.modbus.core.client,i=de.biancoroyal.modbus.core.client.getLogFunction(n);n.queueLog(JSON.stringify({info:"read msg",message:o.payload,unitid:o.queueUnitId,timeout:n.client.getTimeout(),state:n.actualServiceState.value}));try{t.readModbusByFunctionCode(n,o,e,a)}catch(e){t.activateSendingOnFailure(n,a,e,o),i(e.message),n.modbusErrorHandling(e)}}},de.biancoroyal.modbus.core.client.writeModbusByFunctionCodeFive=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;o.payload.value?o.payload.value=!0:o.payload.value=!1,n.client.writeCoil(parseInt(o.payload.address),o.payload.value).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.writeModbusByFunctionCodeFifteen=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;parseInt(o.payload.value.length)!==parseInt(o.payload.quantity)?i.activateSendingOnFailure(n,t,new Error("Quantity should be less or equal to coil payload array length: "+o.payload.value.length+" Addr: "+o.payload.address+" Q: "+o.payload.quantity),o):n.client.writeCoils(parseInt(o.payload.address),o.payload.value).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){n.activateSending(o),t(e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.writeModbusByFunctionCodeSix=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;n.client.writeRegister(parseInt(o.payload.address),parseInt(o.payload.value)).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.writeModbusByFunctionCodeSixteen=function(n,o,a,t){var i=de.biancoroyal.modbus.core.client;parseInt(o.payload.value.length)!==parseInt(o.payload.quantity)?i.activateSendingOnFailure(n,t,new Error("Quantity should be less or equal to register payload array length: "+o.payload.value.length+" Addr: "+o.payload.address+" Q: "+o.payload.quantity),o):n.client.writeRegisters(parseInt(o.payload.address),o.payload.value).then(function(e){i.activateSendingOnSuccess(n,a,t,e,o)}).catch(function(e){i.activateSendingOnFailure(n,t,e,o),n.modbusErrorHandling(e)})},de.biancoroyal.modbus.core.client.writeModbus=function(n,o,e,a){if(n.client){n.bufferCommands||n.stateService.send("WRITE"),n.setUnitIdFromPayload(o),n.client.setTimeout(n.clientTimeout);var t=de.biancoroyal.modbus.core.client,i=de.biancoroyal.modbus.core.client.getLogFunction(n);n.queueLog(JSON.stringify({info:"write msg",message:o.payload,unitid:o.queueUnitId,timeout:n.client.getTimeout(),state:n.actualServiceState.value}));try{switch(parseInt(o.payload.fc)){case 15:t.writeModbusByFunctionCodeFifteen(n,o,e,a);break;case 5:t.writeModbusByFunctionCodeFive(n,o,e,a);break;case 16:t.writeModbusByFunctionCodeSixteen(n,o,e,a);break;case 6:t.writeModbusByFunctionCodeSix(n,o,e,a);break;default:t.activateSendingOnFailure(n,a,new Error("Function Code Unknown"),o),i("Function Code Unknown %s",o.payload.fc)}}catch(e){t.activateSendingOnFailure(n,a,e,o),i(e.message),n.modbusErrorHandling(e)}}},de.biancoroyal.modbus.core.client.setNewTCPNodeSettings=function(e,n){e.tcpHost=n.payload.tcpHost||e.tcpHost,e.tcpPort=n.payload.tcpPort||e.tcpPort,e.tcpType=n.payload.tcpType||e.tcpType},de.biancoroyal.modbus.core.client.setNewSerialNodeSettings=function(e,n){n.payload.serialPort&&(e.serialPort=n.payload.serialPort||e.serialPort),n.payload.serialBaudrate&&(e.serialBaudrate=parseInt(n.payload.serialBaudrate)||e.serialBaudrate),e.serialDatabits=n.payload.serialDatabits||e.serialDatabits,e.serialStopbits=n.payload.serialStopbits||e.serialStopbits,e.serialParity=n.payload.serialParity||e.serialParity,e.serialType=n.payload.serialType||e.serialType,n.payload.serialConnectionDelay&&(e.serialConnectionDelay=parseInt(n.payload.serialConnectionDelay)||e.serialConnectionDelay)},de.biancoroyal.modbus.core.client.setNewNodeOptionalSettings=function(e,n){n.payload.unitId&&(e.unit_id=parseInt(n.payload.unitId)||e.unit_id),n.payload.commandDelay&&(e.commandDelay=parseInt(n.payload.commandDelay)||e.commandDelay),n.payload.clientTimeout&&(e.clientTimeout=parseInt(n.payload.clientTimeout)||e.clientTimeout),n.payload.reconnectTimeout&&(e.reconnectTimeout=parseInt(n.payload.reconnectTimeout)||e.reconnectTimeout)},de.biancoroyal.modbus.core.client.setNewNodeSettings=function(e,n){var o=de.biancoroyal.modbus.core.client.getLogFunction(e),a=de.biancoroyal.modbus.core.client;if(!n)return o("New Connection message invalid."),!1;switch(n.payload.connectorType.toUpperCase()){case"TCP":a.setNewTCPNodeSettings(e,n),o("New Connection TCP Settings "+e.tcpHost+" "+e.tcpPort+" "+e.tcpType);break;case"SERIAL":a.setNewSerialNodeSettings(),o("New Connection Serial Settings "+e.serialPort+" "+e.serialBaudrate+" "+e.serialType);break;default:o("Unknown Dynamic Reconnect Type "+n.payload.connectorType)}return a.setNewNodeOptionalSettings(e,n),!0},de.biancoroyal.modbus.core.client.messagesAllowedStates=["activated","queueing","empty"],module.exports=de.biancoroyal.modbus.core.client;
 //# sourceMappingURL=../maps/core/modbus-client-core.js.map

modbus/locales/en-US/modbus-queue-info.json

@@ -11,5 +11,6 @@ {
       "server": "Server",
-      "errorOnHighLevel": "Error on high level"
+      "errorOnHighLevel": "Error on high level",
+      "showActivities": "Show Activities"
     }
   }
 }

modbus/modbus-client.js

@@ -1,2 +0,2 @@
-"use strict";module.exports=function(c){require("source-map-support").install();var u=require("./modbus-basics"),d=require("./core/modbus-client-core"),l=require("./core/modbus-queue-core");c.nodes.registerType("modbus-client",function(e){c.nodes.createNode(this,e);var t=require("modbus-serial"),n=500,i=2e3,o=" Get More About It By Logging";this.clienttype=e.clienttype,this.bufferCommands=e.bufferCommands,this.queueLogEnabled=e.queueLogEnabled,this.stateLogEnabled=e.stateLogEnabled,this.tcpHost=e.tcpHost,this.tcpPort=parseInt(e.tcpPort)||502,this.tcpType=e.tcpType,this.serialPort=e.serialPort,this.serialBaudrate=e.serialBaudrate,this.serialDatabits=e.serialDatabits,this.serialStopbits=e.serialStopbits,this.serialParity=e.serialParity,this.serialType=e.serialType,this.serialConnectionDelay=parseInt(e.serialConnectionDelay)||n,this.unit_id=parseInt(e.unit_id)||1,this.commandDelay=parseInt(e.commandDelay)||1,this.clientTimeout=parseInt(e.clientTimeout)||1e3,this.reconnectTimeout=parseInt(e.reconnectTimeout)||i,this.reconnectOnTimeout=e.reconnectOnTimeout,this.parallelUnitIdsAllowed=e.parallelUnitIdsAllowed;var r=this;function s(e){c.settings.verbose&&r.warn("Client -> "+e+r.serverInfo)}function a(e){c.settings.verbose&&d.internalDebug("Client -> "+e+r.serverInfo)}r.isFirstInitOfConnection=!0,r.closingModbus=!1,r.client=null,r.bufferCommandList=new Map,r.sendAllowed=new Map,r.unitSendingAllowed=[],r.sendToDeviceAllowed=[],r.messageAllowedStates=d.messagesAllowedStates,r.serverInfo="",r.stateMachine=null,r.stateService=null,r.stateMachine=d.createStateMachineService(),r.actualServiceState=r.stateMachine.initialState,r.actualServiceStateBefore=r.actualServiceState,r.stateService=d.startStateService(r.stateMachine),r.reconnectTimeoutId=0,r.queueTimeoutIdList=[],r.setUnitIdFromPayload=function(e){var t=parseInt(e.payload.unitid);Number.isInteger(t)?(r.client.setID(t),e.queueUnitId=t):(d.checkUnitId(r.unit_id,r.clienttype)||(r.unit_id=1),r.client.setID(r.unit_id),e.queueUnitId=r.unit_id)},!Number.isNaN(r.unit_id)&&d.checkUnitId(r.unit_id,r.clienttype)||(r.unit_id=1),r.updateServerinfo=function(){"tcp"===r.clienttype?r.serverInfo=" TCP@"+r.tcpHost+":"+r.tcpPort:r.serverInfo=" Serial@"+r.serialPort+":"+r.serialBaudrate+"bit/s",r.serverInfo+=" default Unit-Id: "+r.unit_id},r.queueLog=function(e){r.bufferCommands&&r.queueLogEnabled&&a(e)},r.stateService.subscribe(function(e){var t;if(r.actualServiceStateBefore=r.actualServiceState,r.actualServiceState=e,t=e.value,r.stateLogEnabled&&a(t),e.matches("init")){r.updateServerinfo(),l.initQueue(r),r.reconnectTimeoutId=0;try{r.isFirstInitOfConnection?(r.isFirstInitOfConnection=!1,s("init in 500 ms"),setTimeout(r.connectClient,n)):(s("init in "+r.reconnectTimeout+" ms"),setTimeout(r.connectClient,r.reconnectTimeout))}catch(e){r.error(e,{payload:"client connection error "+o})}r.emit("mbinit")}e.matches("connected")&&(r.emit("mbconnected"),r.stateService.send("ACTIVATE")),e.matches("activated")&&(r.emit("mbactive"),r.bufferCommands&&!l.checkQueuesAreEmpty(r)?r.stateService.send("QUEUE"):a("Queues Are Empty On Activated")),e.matches("queueing")&&(r.queueTimeoutIdList.push(setTimeout(function(){l.dequeueCommand(r)},r.commandDelay)),r.emit("mbqueue")),e.matches("opened")&&r.emit("mbopen"),e.matches("closed")&&(r.emit("mbclosed"),r.stateService.send("RECONNECT")),e.matches("stopped")&&(s("stopped state without reconnecting"),r.emit("mbclosed")),e.matches("failed")&&(r.emit("mberror","Modbus Failure On State "+r.actualServiceStateBefore.value+o),r.stateService.send("BREAK")),e.matches("broken")&&(r.emit("mbbroken","Modbus Broken On State "+r.actualServiceStateBefore.value+o),r.reconnectOnTimeout?(r.reconnectTimeout<=0&&(r.reconnectTimeout=i),r.stateService.send("RECONNECT")):(s("We stay active on broken state without reconnecting"),r.stateService.send("ACTIVATE"))),e.matches("reconnecting")&&(r.emit("mbreconnecting"),r.reconnectTimeoutId||(r.reconnectTimeout<=0&&(r.reconnectTimeout=i),s("try to reconnect by init in "+r.reconnectTimeout+" ms"),r.reconnectTimeoutId=setTimeout(function(){r.stateService.send("INIT")},r.reconnectTimeout)))}),r.connectClient=function(){if(r.client)try{r.client.close(function(){a("connection closed")})}catch(e){a(e.message)}if(r.client=null,r.client=new t,r.clientTimeout||(r.clientTimeout=1e3),r.reconnectTimeout||(r.reconnectTimeout=i),"tcp"===r.clienttype){if(!d.checkUnitId(r.unit_id,r.clienttype))return r.error(new Error("wrong unit-id (0..255)"),{payload:r.unit_id}),void r.stateService.send("FAILURE");switch(r.tcpType){case"C701":a("C701 port UDP bridge"),r.client.connectC701(r.tcpHost,{port:r.tcpPort,autoOpen:!0}).then(r.setTCPConnectionOptions).then(r.setTCPConnected).catch(r.modbusTcpErrorHandling);break;case"TELNET":a("Telnet port"),r.client.connectTelnet(r.tcpHost,{port:r.tcpPort,autoOpen:!0}).then(r.setTCPConnectionOptions).catch(r.modbusTcpErrorHandling);break;case"TPC-RTU-BUFFERED":a("TCP RTU buffered port"),r.client.connectTcpRTUBuffered(r.tcpHost,{port:r.tcpPort,autoOpen:!0}).then(r.setTCPConnectionOptions).catch(r.modbusTcpErrorHandling);break;default:a("TCP port"),r.client.connectTCP(r.tcpHost,{port:r.tcpPort,autoOpen:!0}).then(r.setTCPConnectionOptions).catch(r.modbusTcpErrorHandling)}}else{if(!d.checkUnitId(r.unit_id,r.clienttype))return r.error(new Error("wrong unit-id serial (1..247)"),{payload:r.unit_id}),void r.stateService.send("FAILURE");if(r.serialConnectionDelay||(r.serialConnectionDelay=n),!r.serialPort)return r.error(new Error("wrong serial port"),{payload:r.serialPort}),void r.stateService.send("FAILURE");var e={baudRate:parseInt(r.serialBaudrate),dataBits:parseInt(r.serialDatabits),stopBits:parseInt(r.serialStopbits),parity:r.serialParity,autoOpen:!1};switch(r.serialType){case"ASCII":a("ASCII port serial"),r.client.connectAsciiSerial(r.serialPort,e).then(r.setSerialConnectionOptions).catch(r.modbusSerialErrorHandling);break;case"RTU":a("RTU port serial"),r.client.connectRTU(r.serialPort,e).then(r.setSerialConnectionOptions).catch(r.modbusSerialErrorHandling);break;default:a("RTU buffered port serial"),r.client.connectRTUBuffered(r.serialPort,e).then(r.setSerialConnectionOptions).catch(r.modbusSerialErrorHandling)}}},r.setTCPConnectionOptions=function(){r.client.setID(r.unit_id),r.client.setTimeout(r.clientTimeout),r.stateService.send("CONNECT")},r.setTCPConnected=function(){d.modbusSerialDebug("modbus tcp connected on "+r.tcpHost)},r.setSerialConnectionOptions=function(){r.stateService.send("OPENSERIAL"),setTimeout(r.openSerialClient,parseInt(r.serialConnectionDelay))},r.modbusErrorHandling=function(e){e.message?d.modbusSerialDebug("modbusErrorHandling:"+e.message):d.modbusSerialDebug("modbusErrorHandling:"+JSON.stringify(e)),e.errno&&d.networkErrors.includes(e.errno)&&r.stateService.send("FAILURE")},r.modbusTcpErrorHandling=function(e){e.message?d.modbusSerialDebug("modbusTcpErrorHandling:"+e.message):d.modbusSerialDebug("modbusTcpErrorHandling:"+JSON.stringify(e)),e.errno&&d.networkErrors.includes(e.errno)&&r.stateService.send("BREAK")},r.modbusSerialErrorHandling=function(e){e.message?d.modbusSerialDebug("modbusSerialErrorHandling:"+e.message):d.modbusSerialDebug("modbusSerialErrorHandling:"+JSON.stringify(e)),r.stateService.send("BREAK")},r.openSerialClient=function(){"opened"===r.actualServiceState.value?(a("time to open Unit "+r.unit_id),d.modbusSerialDebug("modbus connection opened"),r.client.setID(r.unit_id),r.client.setTimeout(parseInt(r.clientTimeout)),r.client._port.on("close",r.onModbusClose),r.stateService.send("CONNECT")):(a("wrong state on connect serial "+r.actualServiceState.value),d.modbusSerialDebug("modbus connection not opened state is %s",r.actualServiceState.value),r.stateService.send("BREAK"))},r.onModbusClose=function(){s("modbus closed port"),d.modbusSerialDebug("modbus closed port"),r.stateService.send("CLOSE")},r.on("readModbus",function(t,e,n){var i=r.actualServiceState;-1!==r.messageAllowedStates.indexOf(i.value)?r.bufferCommands?(t.queueNumber=l.getQueueNumber(r,t),l.pushToQueueByUnitId(r,d.readModbus,t,e,n).then(function(){r.queueLog(JSON.stringify({info:"queued read msg",message:t.payload,state:i.value,queueLength:r.bufferCommandList.get(t.queueUnit).length})),r.stateService.send("QUEUE")}).catch(function(e){n(e,t)})):d.readModbus(r,t,e,n):n(new Error("Client Not Ready To Read At State "+i.value),t)}),r.on("writeModbus",function(t,e,n){var i=r.actualServiceState;-1!==r.messageAllowedStates.indexOf(i.value)?r.bufferCommands?(t.queueNumber=l.getQueueNumber(r,t),l.pushToQueueByUnitId(r,d.writeModbus,t,e,n).then(function(){r.queueLog(JSON.stringify({info:"queued write msg",message:t.payload,state:i.value,queueLength:r.bufferCommandList.get(t.queueUnit).length})),r.stateService.send("QUEUE")}).catch(function(e){n(e,t)})):d.writeModbus(r,t,e,n):n(new Error("Client Not Ready To Write At State "+i.value),t)}),r.activateSending=function(i){return new Promise(function(e,t){var n=r.sendToDeviceAllowed.shift();r.bufferCommands&&(r.sendAllowed.set(i.queueUnit,!0),r.queueLog(JSON.stringify({info:"queue response activate sending",message:i.payload,queueLength:r.bufferCommandList.length,queueUnit:i.queueUnit,serialUnitId:n}))),l.checkQueuesAreEmpty(r)?r.stateService.send("EMPTY"):r.stateService.send("ACTIVATE"),e()})},a("initialized"),r.setMaxListeners(0),r.on("reconnect",function(){r.stateService.send("CLOSE")}),r.on("dynamicReconnect",function(e,t,n){if(u.invalidPayloadIn(e))throw new Error("Message Or Payload Not Valid");d.internalDebug("Dynamic Reconnect Parameters "+JSON.stringify(e.payload)),d.setNewNodeSettings(r,e)?t(e):n(new Error("Message Or Payload Not Valid"),e),d.internalDebug("Dynamic Reconnect Starts on actual state "+r.actualServiceState.value),r.stateService.send("CLOSE")}),r.cleanModbusTimeouts=function(){r.queueTimeoutIdList.forEach(function(e){return clearTimeout(e)})},r.on("close",function(t){a("stop fsm on close"),r.stateService.send("STOP"),r.stateMachine=null,r.cleanModbusTimeouts(),a("close node"),r.client?r.client.close(function(){a("connection closed"),t()}).catch(function(e){a(e.message),t()}):t()}),r.registeredNodeList={},r.registerForModbus=function(e){r.registeredNodeList[e.id]=e,1===Object.keys(r.registeredNodeList).length&&(r.closingModbus=!1,r.stateService.send("NEW"),r.stateService.send("INIT"))},r.deregisterForModbus=function(e,t){delete r.registeredNodeList[e.id],r.closingModbus&&t(),0===Object.keys(r.registeredNodeList).length?(r.closingModbus=!0,r.client?r.client.close(function(){r.stateService.send("STOP"),t()}).catch(function(e){r.stateService.send("STOP"),a(e.message),t()}):t()):t()}}),c.httpAdmin.get("/modbus/serial/ports",c.auth.needsPermission("serial.read"),function(e,t){require("serialport").list().then(function(e){t.json(e)}).catch(function(e){d.internalDebug(e.message)})})};
+"use strict";module.exports=function(c){require("source-map-support").install();var u=require("./modbus-basics"),l=require("./core/modbus-client-core"),d=require("./core/modbus-queue-core");c.nodes.registerType("modbus-client",function(e){c.nodes.createNode(this,e);var t=require("modbus-serial"),n=500,i=2e3,o=" Get More About It By Logging";this.clienttype=e.clienttype,this.bufferCommands=e.bufferCommands,this.queueLogEnabled=e.queueLogEnabled,this.stateLogEnabled=e.stateLogEnabled,this.tcpHost=e.tcpHost,this.tcpPort=parseInt(e.tcpPort)||502,this.tcpType=e.tcpType,this.serialPort=e.serialPort,this.serialBaudrate=e.serialBaudrate,this.serialDatabits=e.serialDatabits,this.serialStopbits=e.serialStopbits,this.serialParity=e.serialParity,this.serialType=e.serialType,this.serialConnectionDelay=parseInt(e.serialConnectionDelay)||n,this.unit_id=parseInt(e.unit_id)||1,this.commandDelay=parseInt(e.commandDelay)||1,this.clientTimeout=parseInt(e.clientTimeout)||1e3,this.reconnectTimeout=parseInt(e.reconnectTimeout)||i,this.reconnectOnTimeout=e.reconnectOnTimeout,this.parallelUnitIdsAllowed=e.parallelUnitIdsAllowed;var s=this;function r(e){c.settings.verbose&&s.warn("Client -> "+e+s.serverInfo)}function a(e){c.settings.verbose&&l.internalDebug("Client -> "+e+s.serverInfo)}s.isFirstInitOfConnection=!0,s.closingModbus=!1,s.client=null,s.bufferCommandList=new Map,s.sendAllowed=new Map,s.unitSendingAllowed=[],s.sendToDeviceAllowed=[],s.messageAllowedStates=l.messagesAllowedStates,s.serverInfo="",s.stateMachine=null,s.stateService=null,s.stateMachine=l.createStateMachineService(),s.actualServiceState=s.stateMachine.initialState,s.actualServiceStateBefore=s.actualServiceState,s.stateService=l.startStateService(s.stateMachine),s.reconnectTimeoutId=0,s.clientTimeoutsList=[],s.setUnitIdFromPayload=function(e){var t=parseInt(e.payload.unitid);Number.isInteger(t)?(s.client.setID(t),e.queueUnitId=t):(l.checkUnitId(s.unit_id,s.clienttype)||(s.unit_id=1),s.client.setID(s.unit_id),e.queueUnitId=s.unit_id)},!Number.isNaN(s.unit_id)&&l.checkUnitId(s.unit_id,s.clienttype)||(s.unit_id=1),s.updateServerinfo=function(){"tcp"===s.clienttype?s.serverInfo=" TCP@"+s.tcpHost+":"+s.tcpPort:s.serverInfo=" Serial@"+s.serialPort+":"+s.serialBaudrate+"bit/s",s.serverInfo+=" default Unit-Id: "+s.unit_id},s.queueLog=function(e){s.bufferCommands&&s.queueLogEnabled&&a(e)},s.stateService.subscribe(function(e){var t;if(s.actualServiceStateBefore=s.actualServiceState,s.actualServiceState=e,t=e.value,s.stateLogEnabled&&a(t),e.matches("init")){s.updateServerinfo(),d.initQueue(s),s.reconnectTimeoutId=0;try{s.isFirstInitOfConnection?(s.isFirstInitOfConnection=!1,r("init in 500 ms"),s.clientTimeoutsList.push(setTimeout(s.connectClient,n))):(r("init in "+s.reconnectTimeout+" ms"),s.clientTimeoutsList.push(setTimeout(s.connectClient,s.reconnectTimeout)))}catch(e){s.error(e,{payload:"client connection error "+o})}s.emit("mbinit")}e.matches("connected")&&(s.emit("mbconnected"),s.stateService.send("ACTIVATE")),e.matches("activated")&&(s.emit("mbactive"),s.bufferCommands&&!d.checkQueuesAreEmpty(s)?s.stateService.send("QUEUE"):a("Queues Are Empty On Activated")),e.matches("queueing")&&(s.clientTimeoutsList.push(setTimeout(function(){d.dequeueCommand(s)},s.commandDelay)),s.emit("mbqueue")),e.matches("opened")&&s.emit("mbopen"),e.matches("closed")&&(s.emit("mbclosed"),s.stateService.send("RECONNECT")),e.matches("stopped")&&(r("stopped state without reconnecting"),s.emit("mbclosed")),e.matches("failed")&&(s.emit("mberror","Modbus Failure On State "+s.actualServiceStateBefore.value+o),s.stateService.send("BREAK")),e.matches("broken")&&(s.emit("mbbroken","Modbus Broken On State "+s.actualServiceStateBefore.value+o),s.reconnectOnTimeout?(s.reconnectTimeout<=0&&(s.reconnectTimeout=i),s.stateService.send("RECONNECT")):(r("We stay active on broken state without reconnecting"),s.stateService.send("ACTIVATE"))),e.matches("reconnecting")&&(s.emit("mbreconnecting"),s.reconnectTimeoutId||(s.reconnectTimeout<=0&&(s.reconnectTimeout=i),r("try to reconnect by init in "+s.reconnectTimeout+" ms"),s.reconnectTimeoutId=setTimeout(function(){s.stateService.send("INIT")},s.reconnectTimeout),s.clientTimeoutsList.push(s.reconnectTimeoutId)))}),s.connectClient=function(){if(s.client)try{s.client.close(function(){a("connection closed")}),a("connection close sent")}catch(e){a(e.message)}if(s.client=null,s.client=new t,s.clientTimeout||(s.clientTimeout=1e3),s.reconnectTimeout||(s.reconnectTimeout=i),"tcp"===s.clienttype){if(!l.checkUnitId(s.unit_id,s.clienttype))return s.error(new Error("wrong unit-id (0..255)"),{payload:s.unit_id}),void s.stateService.send("FAILURE");switch(s.tcpType){case"C701":a("C701 port UDP bridge"),s.client.connectC701(s.tcpHost,{port:s.tcpPort,autoOpen:!0}).then(s.setTCPConnectionOptions).then(s.setTCPConnected).catch(s.modbusTcpErrorHandling);break;case"TELNET":a("Telnet port"),s.client.connectTelnet(s.tcpHost,{port:s.tcpPort,autoOpen:!0}).then(s.setTCPConnectionOptions).catch(s.modbusTcpErrorHandling);break;case"TPC-RTU-BUFFERED":a("TCP RTU buffered port"),s.client.connectTcpRTUBuffered(s.tcpHost,{port:s.tcpPort,autoOpen:!0}).then(s.setTCPConnectionOptions).catch(s.modbusTcpErrorHandling);break;default:a("TCP port"),s.client.connectTCP(s.tcpHost,{port:s.tcpPort,autoOpen:!0}).then(s.setTCPConnectionOptions).catch(s.modbusTcpErrorHandling)}}else{if(!l.checkUnitId(s.unit_id,s.clienttype))return s.error(new Error("wrong unit-id serial (1..247)"),{payload:s.unit_id}),void s.stateService.send("FAILURE");if(s.serialConnectionDelay||(s.serialConnectionDelay=n),!s.serialPort)return s.error(new Error("wrong serial port"),{payload:s.serialPort}),void s.stateService.send("FAILURE");var e={baudRate:parseInt(s.serialBaudrate),dataBits:parseInt(s.serialDatabits),stopBits:parseInt(s.serialStopbits),parity:s.serialParity,autoOpen:!1};switch(s.serialType){case"ASCII":a("ASCII port serial"),s.client.connectAsciiSerial(s.serialPort,e).then(s.setSerialConnectionOptions).catch(s.modbusSerialErrorHandling);break;case"RTU":a("RTU port serial"),s.client.connectRTU(s.serialPort,e).then(s.setSerialConnectionOptions).catch(s.modbusSerialErrorHandling);break;default:a("RTU buffered port serial"),s.client.connectRTUBuffered(s.serialPort,e).then(s.setSerialConnectionOptions).catch(s.modbusSerialErrorHandling)}}},s.setTCPConnectionOptions=function(){s.client.setID(s.unit_id),s.client.setTimeout(s.clientTimeout),s.stateService.send("CONNECT")},s.setTCPConnected=function(){l.modbusSerialDebug("modbus tcp connected on "+s.tcpHost)},s.setSerialConnectionOptions=function(){s.stateService.send("OPENSERIAL"),s.clientTimeoutsList.push(setTimeout(s.openSerialClient,parseInt(s.serialConnectionDelay)))},s.modbusErrorHandling=function(e){e.message?l.modbusSerialDebug("modbusErrorHandling:"+e.message):l.modbusSerialDebug("modbusErrorHandling:"+JSON.stringify(e)),e.errno&&l.networkErrors.includes(e.errno)&&s.stateService.send("FAILURE")},s.modbusTcpErrorHandling=function(e){e.message?l.modbusSerialDebug("modbusTcpErrorHandling:"+e.message):l.modbusSerialDebug("modbusTcpErrorHandling:"+JSON.stringify(e)),e.errno&&l.networkErrors.includes(e.errno)&&s.stateService.send("BREAK")},s.modbusSerialErrorHandling=function(e){e.message?l.modbusSerialDebug("modbusSerialErrorHandling:"+e.message):l.modbusSerialDebug("modbusSerialErrorHandling:"+JSON.stringify(e)),s.stateService.send("BREAK")},s.openSerialClient=function(){"opened"===s.actualServiceState.value?(a("time to open Unit "+s.unit_id),l.modbusSerialDebug("modbus connection opened"),s.client.setID(s.unit_id),s.client.setTimeout(parseInt(s.clientTimeout)),s.client._port.on("close",s.onModbusClose),s.stateService.send("CONNECT")):(a("wrong state on connect serial "+s.actualServiceState.value),l.modbusSerialDebug("modbus connection not opened state is %s",s.actualServiceState.value),s.stateService.send("BREAK"))},s.onModbusClose=function(){r("modbus closed port"),l.modbusSerialDebug("modbus closed port"),s.stateService.send("CLOSE")},s.on("readModbus",function(t,e,n){var i=s.actualServiceState;-1!==s.messageAllowedStates.indexOf(i.value)?s.bufferCommands?(t.queueNumber=d.getQueueNumber(s,t),d.pushToQueueByUnitId(s,l.readModbus,t,e,n).then(function(){s.queueLog(JSON.stringify({info:"queued read msg",message:t.payload,state:i.value,queueLength:s.bufferCommandList.get(t.queueUnit).length})),s.stateService.send("QUEUE")}).catch(function(e){n(e,t)})):l.readModbus(s,t,e,n):n(new Error("Client Not Ready To Read At State "+i.value),t)}),s.on("writeModbus",function(t,e,n){var i=s.actualServiceState;-1!==s.messageAllowedStates.indexOf(i.value)?s.bufferCommands?(t.queueNumber=d.getQueueNumber(s,t),d.pushToQueueByUnitId(s,l.writeModbus,t,e,n).then(function(){s.queueLog(JSON.stringify({info:"queued write msg",message:t.payload,state:i.value,queueLength:s.bufferCommandList.get(t.queueUnit).length})),s.stateService.send("QUEUE")}).catch(function(e){n(e,t)})):l.writeModbus(s,t,e,n):n(new Error("Client Not Ready To Write At State "+i.value),t)}),s.activateSending=function(i){return new Promise(function(e,t){try{var n=s.sendToDeviceAllowed.shift();s.bufferCommands&&(s.sendAllowed.set(i.queueUnit,!0),s.queueLog(JSON.stringify({info:"queue response activate sending",message:i.payload,queueLength:s.bufferCommandList.length,queueUnit:i.queueUnit,serialUnitId:n}))),d.checkQueuesAreEmpty(s)?s.stateService.send("EMPTY"):s.stateService.send("ACTIVATE"),e()}catch(e){t(e)}})},a("initialized"),s.setMaxListeners(0),s.on("reconnect",function(){s.stateService.send("CLOSE")}),s.on("dynamicReconnect",function(e,t,n){if(u.invalidPayloadIn(e))throw new Error("Message Or Payload Not Valid");l.internalDebug("Dynamic Reconnect Parameters "+JSON.stringify(e.payload)),l.setNewNodeSettings(s,e)?t(e):n(new Error("Message Or Payload Not Valid"),e),l.internalDebug("Dynamic Reconnect Starts on actual state "+s.actualServiceState.value),s.stateService.send("CLOSE")}),s.cleanModbusTimeouts=function(){s.clientTimeoutsList.forEach(function(e){return clearTimeout(e)})},s.on("close",function(t){s.closingModbus=!0,a("stop fsm on close "+s.name),s.stateService.send("STOP"),s.cleanModbusTimeouts(),a("close node "+s.name),s.client?s.client.isOpen?s.client.close(function(e){a(e?"Connection closed with error "+s.name:"Connection closed well "+s.name),t()}):(a("connection was closed "+s.name),t()):(a("Connection closed simple "+s.name),t())}),s.registeredNodeList={},s.registerForModbus=function(e){s.registeredNodeList[e.id]=e,1===Object.keys(s.registeredNodeList).length&&(s.closingModbus=!1,s.stateService.send("NEW"),s.stateService.send("INIT"))},s.closeConnectionWithoutRegisteredNodes=function(e){0===Object.keys(s.registeredNodeList).length?(s.closingModbus=!0,s.client&&"stopped"!==s.actualServiceState.value&&s.client.isOpen?s.client.close(function(){s.stateService.send("STOP"),e()}):(s.stateService.send("STOP"),e())):e()},s.deregisterForModbus=function(e,t){delete s.registeredNodeList[e.id],s.closingModbus?t():s.closeConnectionWithoutRegisteredNodes(t)}}),c.httpAdmin.get("/modbus/serial/ports",c.auth.needsPermission("serial.read"),function(e,t){require("serialport").list().then(function(e){t.json(e)}).catch(function(e){t.json([e.message]),l.internalDebug(e.message)})})};
 //# sourceMappingURL=maps/modbus-client.js.map

modbus/modbus-flex-getter.js

@@ -1,2 +0,2 @@
-"use strict";module.exports=function(s){require("source-map-support").install();var o=require("./modbus-basics"),i=require("./core/modbus-core"),r=require("./core/modbus-io-core"),d=require("debug")("contribModbus:flex:getter");s.nodes.registerType("modbus-flex-getter",function(e){s.nodes.createNode(this,e),this.name=e.name,this.showStatusActivities=e.showStatusActivities,this.showErrors=e.showErrors,this.connection=null,this.useIOFile=e.useIOFile,this.ioFile=s.nodes.getNode(e.ioFile),this.useIOForPayload=e.useIOForPayload,this.logIOActivities=e.logIOActivities,this.emptyMsgOnFail=e.emptyMsgOnFail,this.internalDebugLog=d;var a=this;a.bufferMessageList=new Map,o.setNodeStatusTo("waiting",a);var t=s.nodes.getNode(e.server);t&&(t.registerForModbus(a),o.initModbusClientEvents(a,t),a.onModbusReadDone=function(e,s){a.showStatusActivities&&o.setNodeStatusTo("reading done",a),a.send(r.buildMessageWithIO(a,e.data,e,s))},a.onModbusReadError=function(e,s){d(e.message),a.showErrors&&a.error(e,s),o.emptyMsgOnFail(a,e,s),o.setModbusError(a,t,e,i.getOriginalMessage(a.bufferMessageList,s))},a.on("input",function(s){if(!o.invalidPayloadIn(s)&&t.client){try{if("string"==typeof s.payload&&(s.payload=JSON.parse(s.payload)),s.payload.fc=parseInt(s.payload.fc)||3,s.payload.unitid=parseInt(s.payload.unitid),s.payload.address=parseInt(s.payload.address)||0,s.payload.quantity=parseInt(s.payload.quantity)||1,!(Number.isInteger(s.payload.fc)&&1<=s.payload.fc&&s.payload.fc<=4))return void a.error("FC Not Valid",s);if(!(Number.isInteger(s.payload.address)&&0<=s.payload.address&&s.payload.address<=65535))return void a.error("Address Not Valid",s);if(!(Number.isInteger(s.payload.quantity)&&1<=s.payload.quantity&&s.payload.quantity<=65535))return void a.error("Quantity Not Valid",s);s.messageId=i.getObjectId(),a.bufferMessageList.set(s.messageId,s),s={topic:s.topic||a.id,payload:{value:s.payload.value||s.value,unitid:s.payload.unitid,fc:s.payload.fc,address:s.payload.address,quantity:s.payload.quantity,messageId:s.messageId,emptyMsgOnFail:a.emptyMsgOnFail},_msgid:s._msgid},t.emit("readModbus",s,a.onModbusReadDone,a.onModbusReadError)}catch(e){d(e.message),a.showErrors&&a.error(e,s),o.emptyMsgOnFail(a,e,s)}a.showStatusActivities&&o.setNodeStatusTo(t.actualServiceState,a)}}),a.on("close",function(e){o.setNodeStatusTo("closed",a),a.bufferMessageList.clear(),t.deregisterForModbus(a,e)}))})};
+"use strict";module.exports=function(s){require("source-map-support").install();var o=require("./modbus-basics"),i=require("./core/modbus-core"),r=require("./core/modbus-io-core"),d=require("debug")("contribModbus:flex:getter");s.nodes.registerType("modbus-flex-getter",function(e){s.nodes.createNode(this,e),this.name=e.name,this.showStatusActivities=e.showStatusActivities,this.showErrors=e.showErrors,this.connection=null,this.useIOFile=e.useIOFile,this.ioFile=s.nodes.getNode(e.ioFile),this.useIOForPayload=e.useIOForPayload,this.logIOActivities=e.logIOActivities,this.emptyMsgOnFail=e.emptyMsgOnFail,this.internalDebugLog=d;var a=this;a.bufferMessageList=new Map,o.setNodeStatusTo("waiting",a);var t=s.nodes.getNode(e.server);t&&(t.registerForModbus(a),o.initModbusClientEvents(a,t),a.onModbusReadDone=function(e,s){a.showStatusActivities&&o.setNodeStatusTo("reading done",a),a.send(r.buildMessageWithIO(a,e.data,e,s))},a.onModbusReadError=function(e,s){d(e.message),a.showErrors&&a.error(e,s),o.emptyMsgOnFail(a,e,s),o.setModbusError(a,t,e,i.getOriginalMessage(a.bufferMessageList,s))},a.prepareMsg=function(e){return"string"==typeof e.payload&&(e.payload=JSON.parse(e.payload)),e.payload.fc=parseInt(e.payload.fc)||3,e.payload.unitid=parseInt(e.payload.unitid),e.payload.address=parseInt(e.payload.address)||0,e.payload.quantity=parseInt(e.payload.quantity)||1,e},a.isValidModbusMsg=function(e){var s=!0;return Number.isInteger(e.payload.fc)&&1<=e.payload.fc&&e.payload.fc<=4||(a.error("FC Not Valid",e),s&=!1),!s||Number.isInteger(e.payload.address)&&0<=e.payload.address&&e.payload.address<=65535||(a.error("Address Not Valid",e),s&=!1),!s||Number.isInteger(e.payload.quantity)&&1<=e.payload.quantity&&e.payload.quantity<=65535||(a.error("Quantity Not Valid",e),s&=!1),s},a.buildNewMessageObject=function(e,s){return{topic:s.topic||e.id,payload:{value:s.payload.value||s.value,unitid:s.payload.unitid,fc:s.payload.fc,address:s.payload.address,quantity:s.payload.quantity,messageId:s.messageId,emptyMsgOnFail:e.emptyMsgOnFail},_msgid:s._msgid}},a.on("input",function(s){if(!o.invalidPayloadIn(s)&&t.client){try{if(s=a.prepareMsg(s),a.isValidModbusMsg(s)){s.messageId=i.getObjectId(),a.bufferMessageList.set(s.messageId,s);var e=a.buildNewMessageObject(a,s);t.emit("readModbus",e,a.onModbusReadDone,a.onModbusReadError)}}catch(e){d(e.message),a.showErrors&&a.error(e,s),o.emptyMsgOnFail(a,e,s)}a.showStatusActivities&&o.setNodeStatusTo(t.actualServiceState,a)}}),a.on("close",function(e){o.setNodeStatusTo("closed",a),a.bufferMessageList.clear(),t.deregisterForModbus(a,e)}))})};
 //# sourceMappingURL=maps/modbus-flex-getter.js.map

modbus/modbus-flex-write.js

@@ -1,2 +0,2 @@
-"use strict";module.exports=function(a){require("source-map-support").install();var o=require("./modbus-basics"),r=require("./core/modbus-core"),i=require("debug")("contribModbus:flex:write");a.nodes.registerType("modbus-flex-write",function(e){a.nodes.createNode(this,e),this.name=e.name,this.showStatusActivities=e.showStatusActivities,this.showErrors=e.showErrors,this.emptyMsgOnFail=e.emptyMsgOnFail,this.internalDebugLog=i;var s=this;s.bufferMessageList=new Map,o.setNodeStatusTo("waiting",s);var t=a.nodes.getNode(e.server);t&&(t.registerForModbus(s),o.initModbusClientEvents(s,t),s.onModbusWriteDone=function(e,a){s.showStatusActivities&&o.setNodeStatusTo("writing done",s),s.send(r.buildMessage(s.bufferMessageList,a.payload,e,a))},s.onModbusWriteError=function(e,a){i(e.message),s.showErrors&&s.error(e,a),o.emptyMsgOnFail(s,e,a),o.setModbusError(s,t,e,r.getOriginalMessage(s.bufferMessageList,a))},s.on("input",function(a){if(!o.invalidPayloadIn(a)&&t.client){try{if("string"==typeof a.payload&&(a.payload=JSON.parse(a.payload)),a.payload.fc=parseInt(a.payload.fc),a.payload.unitid=parseInt(a.payload.unitid),a.payload.address=parseInt(a.payload.address),a.payload.quantity=parseInt(a.payload.quantity),!Number.isInteger(a.payload.fc)||5!==a.payload.fc&&6!==a.payload.fc&&15!==a.payload.fc&&16!==a.payload.fc)return void s.error("FC Not Valid",a);if(!(Number.isInteger(a.payload.address)&&0<=a.payload.address&&a.payload.address<=65535))return void s.error("Address Not Valid",a);if(!(Number.isInteger(a.payload.quantity)&&1<=a.payload.quantity&&a.payload.quantity<=65535))return void s.error("Quantity Not Valid",a);Object.prototype.hasOwnProperty.call(a.payload,"value")&&"string"==typeof a.payload.value&&("true"===a.payload.value||"false"===a.payload.value?a.payload.value="true"===a.payload.value:-1<a.payload.value.indexOf(",")&&(a.payload.value=JSON.parse(a.payload.value))),a.messageId=r.getObjectId(),s.bufferMessageList.set(a.messageId,a),a={topic:a.topic||s.id,payload:{value:a.payload.value||a.value,unitid:a.payload.unitid,fc:a.payload.fc,address:a.payload.address,quantity:a.payload.quantity,messageId:a.messageId},_msgid:a._msgid},t.emit("writeModbus",a,s.onModbusWriteDone,s.onModbusWriteError)}catch(e){i(e.message),s.showErrors&&s.error(e,a),o.emptyMsgOnFail(s,e,a)}s.showStatusActivities&&o.setNodeStatusTo(t.actualServiceState,s)}}),s.on("close",function(e){o.setNodeStatusTo("closed",s),s.bufferMessageList.clear(),t.deregisterForModbus(s,e)}))})};
+"use strict";module.exports=function(a){require("source-map-support").install();var o=require("./modbus-basics"),r=require("./core/modbus-core"),i=require("debug")("contribModbus:flex:write");a.nodes.registerType("modbus-flex-write",function(e){a.nodes.createNode(this,e),this.name=e.name,this.showStatusActivities=e.showStatusActivities,this.showErrors=e.showErrors,this.emptyMsgOnFail=e.emptyMsgOnFail,this.internalDebugLog=i;var s=this;s.bufferMessageList=new Map,o.setNodeStatusTo("waiting",s);var t=a.nodes.getNode(e.server);t&&(t.registerForModbus(s),o.initModbusClientEvents(s,t),s.onModbusWriteDone=function(e,a){s.showStatusActivities&&o.setNodeStatusTo("writing done",s),s.send(r.buildMessage(s.bufferMessageList,a.payload,e,a))},s.onModbusWriteError=function(e,a){i(e.message),s.showErrors&&s.error(e,a),o.emptyMsgOnFail(s,e,a),o.setModbusError(s,t,e,r.getOriginalMessage(s.bufferMessageList,a))},s.prepareMsg=function(e){return"string"==typeof e.payload&&(e.payload=JSON.parse(e.payload)),e.payload.fc=parseInt(e.payload.fc),e.payload.unitid=parseInt(e.payload.unitid),e.payload.address=parseInt(e.payload.address),e.payload.quantity=parseInt(e.payload.quantity),e},s.isValidModbusMsg=function(e){var a=!0;return Number.isInteger(e.payload.fc)&&(5===e.payload.fc||6===e.payload.fc||15===e.payload.fc||16===e.payload.fc)||(s.error("FC Not Valid",e),a&=!1),!a||Number.isInteger(e.payload.address)&&0<=e.payload.address&&e.payload.address<=65535||(s.error("Address Not Valid",e),a&=!1),!a||Number.isInteger(e.payload.quantity)&&1<=e.payload.quantity&&e.payload.quantity<=65535||(s.error("Quantity Not Valid",e),a&=!1),a},s.setMsgPayloadFromHTTPRequests=function(e){return Object.prototype.hasOwnProperty.call(e.payload,"value")&&"string"==typeof e.payload.value&&("true"===e.payload.value||"false"===e.payload.value?e.payload.value="true"===e.payload.value:-1<e.payload.value.indexOf(",")&&(e.payload.value=JSON.parse(e.payload.value))),e},s.buildNewMessageObject=function(e,a){return{topic:a.topic||e.id,payload:{value:a.payload.value||a.value,unitid:a.payload.unitid,fc:a.payload.fc,address:a.payload.address,quantity:a.payload.quantity,messageId:a.messageId},_msgid:a._msgid}},s.on("input",function(a){if(!o.invalidPayloadIn(a)&&t.client){try{if(a=s.prepareMsg(a),s.isValidModbusMsg(a)){(a=s.setMsgPayloadFromHTTPRequests(a)).messageId=r.getObjectId(),s.bufferMessageList.set(a.messageId,a);var e=s.buildNewMessageObject(s,a);t.emit("writeModbus",e,s.onModbusWriteDone,s.onModbusWriteError)}}catch(e){i(e.message),s.showErrors&&s.error(e,a),o.emptyMsgOnFail(s,e,a)}s.showStatusActivities&&o.setNodeStatusTo(t.actualServiceState,s)}}),s.on("close",function(e){o.setNodeStatusTo("closed",s),s.bufferMessageList.clear(),t.deregisterForModbus(s,e)}))})};
 //# sourceMappingURL=maps/modbus-flex-write.js.map

modbus/modbus-queue-info.js

@@ -1,2 +0,2 @@
-"use strict";module.exports=function(t){require("source-map-support").install();var r=require("./modbus-basics"),u=require("./core/modbus-queue-core"),o=require("debug")("contribModbus:queue");t.nodes.registerType("modbus-queue-info",function(e){t.nodes.createNode(this,e),this.name=e.name,this.topic=e.topic,this.unitid=parseInt(e.unitid),this.lowLowLevel=parseInt(e.lowLowLevel),this.lowLevel=parseInt(e.lowLevel),this.highLevel=parseInt(e.highLevel),this.highHighLevel=parseInt(e.highHighLevel),this.errorOnHighLevel=e.errorOnHighLevel,this.queueReadIntervalTime=e.queueReadIntervalTime||1e3,this.internalDebugLog=o;var l=this;l.queueReadInterval=null,r.setNodeStatusTo("waiting",l);var a=t.nodes.getNode(e.server);a&&(a.registerForModbus(l),r.initModbusClientEvents(l,a),l.resetStates=function(){l.lowLowLevelReached=!0,l.lowLevelReached=!1,l.highLevelReached=!1,l.highHighLevelReached=!1},l.resetStates(),l.readFromQueue=function(){var e=l.unitid||1;if(a.bufferCommands){(e<0||255<e)&&(e=1);var i=a.bufferCommandList.get(e).length;if((!i||!l.lowLowLevelReached&&i<l.lowLowLevel)&&l.resetStates(),!l.lowLevelReached&&i>l.lowLowLevel&&i<l.lowLevel){l.lowLevelReached=!0;var t={payload:Date.now(),topic:l.topic,state:"low level reached",unitid:e,modbusClientName:a.name,items:i};l.send(t)}if(!l.highLevelReached&&i>l.lowLevel&&i>l.highLevel){l.highLevelReached=!0;var u={payload:Date.now(),topic:l.topic,state:"high level reached",unitid:e,modbusClientName:a.name,highLevel:l.highLevel,items:i};l.errorOnHighLevel?l.error(new Error("Queue High Level Reached"),u):l.warn(u),l.send(u)}if(!l.highHighLevelReached&&i>l.highLevel&&i>l.highHighLevel){l.highHighLevelReached=!0;var o={payload:Date.now(),topic:l.topic,state:"high high level reached",unitid:e,modbusClientName:a.name,highLevel:l.highLevel,highHighLevel:l.highHighLevel,items:i};l.error(new Error("Queue High High Level Reached"),o),l.send(o)}var n="blue";l.lowLevelReached&&(n="green"),l.highLevelReached&&(n=l.errorOnHighLevel?"red":"yellow"),l.highHighLevelReached&&(n="red"),l.status({fill:n,shape:"ring",text:"active unit "+e+" queue items: "+i})}else r.setNodeStatusTo("active unit "+e+" without queue",l)},l.onModbusInit=function(){l.readFromQueue()},l.onModbusActive=function(){l.readFromQueue()},l.onModbusQueue=function(){l.readFromQueue()},a.on("mbinit",l.onModbusInit),a.on("mbqueue",l.onModbusQueue),a.on("mbactive",l.onModbusActive),l.queueReadInterval=setInterval(l.readFromQueue,l.queueReadIntervalTime),l.on("input",function(e){if(e.queueEnabled=a.bufferCommands,Number.isInteger(l.unitid)?(e.queue=a.bufferCommandList.get(l.unitid),e.unitid=l.unitid):e.queues=a.bufferCommandList,e.queueOptions={date:Date.now(),state:"queue request",modbusClientName:a.name,lowlowLevel:l.lowlowLevel,lowLevel:l.lowLevel,highLevel:l.highLevel,highHighLevel:l.highHighLevel},e&&e.resetQueue&&a.bufferCommands){if(u.initQueue(a),t.settings.verbose){var i="Init Queue By External Node";a.warn(i),o(i)}l.resetStates(),l.status({fill:"blue",shape:"ring",text:"active empty unit queue"}),e.queueOptions.state="queue reset done"}l.send(e)}),l.on("close",function(e){r.setNodeStatusTo("closed",l),l.queueReadInterval&&clearInterval(l.queueReadInterval),l.queueReadInterval=null,a.deregisterForModbus(l,e)}))})};
+"use strict";module.exports=function(u){require("source-map-support").install();var h=require("./modbus-basics"),n=require("./core/modbus-queue-core"),a=require("debug")("contribModbus:queue");u.nodes.registerType("modbus-queue-info",function(e){u.nodes.createNode(this,e),this.name=e.name,this.topic=e.topic,this.unitid=parseInt(e.unitid),this.lowLowLevel=parseInt(e.lowLowLevel),this.lowLevel=parseInt(e.lowLevel),this.highLevel=parseInt(e.highLevel),this.highHighLevel=parseInt(e.highHighLevel),this.errorOnHighLevel=e.errorOnHighLevel,this.queueReadIntervalTime=e.queueReadIntervalTime||1e3,this.showStatusActivities=e.showStatusActivities,this.internalDebugLog=a;var i=this;i.queueReadInterval=null,h.setNodeStatusTo("waiting",i);var o=u.nodes.getNode(e.server);o&&(o.registerForModbus(i),h.initModbusClientEvents(i,o),i.resetStates=function(){i.lowLowLevelReached=!0,i.lowLevelReached=!1,i.highLevelReached=!1,i.highHighLevelReached=!1},i.resetStates(),i.checkLowLevelReached=function(e,t,i){if(!e.lowLevelReached&&t>e.lowLowLevel&&t<e.lowLevel){e.lowLevelReached=!0;var u={payload:Date.now(),topic:e.topic,state:"low level reached",unitid:i,modbusClientName:o.name,items:t};e.send(u)}},i.checkHighLevelReached=function(e,t,i){if(!e.highLevelReached&&t>e.lowLevel&&t>e.highLevel){e.highLevelReached=!0;var u={payload:Date.now(),topic:e.topic,state:"high level reached",unitid:i,modbusClientName:o.name,highLevel:e.highLevel,items:t};e.errorOnHighLevel?e.error(new Error("Queue High Level Reached"),u):e.warn(u),e.send(u)}},i.checkHighHighLevelReached=function(e,t,i){if(!e.highHighLevelReached&&t>e.highLevel&&t>e.highHighLevel){e.highHighLevelReached=!0;var u={payload:Date.now(),topic:e.topic,state:"high high level reached",unitid:i,modbusClientName:o.name,highLevel:e.highLevel,highHighLevel:e.highHighLevel,items:t};e.error(new Error("Queue High High Level Reached"),u),e.send(u)}},i.getStatusSituationFillColor=function(){var e="blue";return i.lowLevelReached&&(e="green"),i.highLevelReached&&(e=i.errorOnHighLevel?"red":"yellow"),i.highHighLevelReached&&(e="red"),e},i.readFromQueue=function(){var e=i.unitid||1;if(o.bufferCommands){(e<1||255<e)&&(e=1);var t=o.bufferCommandList.get(e).length;(!t||!i.lowLowLevelReached&&t<i.lowLowLevel)&&i.resetStates(),i.checkLowLevelReached(i,t,e),i.checkHighLevelReached(i,t,e),i.checkHighHighLevelReached(i,t,e),i.showStatusActivities&&i.status({fill:i.getStatusSituationFillColor(),shape:"ring",text:"active unit "+e+" queue items: "+t})}else i.showStatusActivities&&h.setNodeStatusTo("active unit "+e+" without queue",i)},i.onModbusInit=function(){i.readFromQueue()},i.onModbusActive=function(){i.readFromQueue()},i.onModbusQueue=function(){i.readFromQueue()},o.on("mbinit",i.onModbusInit),o.on("mbqueue",i.onModbusQueue),o.on("mbactive",i.onModbusActive),i.queueReadInterval=setInterval(i.readFromQueue,i.queueReadIntervalTime),i.on("input",function(e){if(e.queueEnabled=o.bufferCommands,Number.isInteger(i.unitid)?(e.queue=o.bufferCommandList.get(i.unitid),e.unitid=i.unitid):e.queues=o.bufferCommandList,e.queueOptions={date:Date.now(),state:"queue request",modbusClientName:o.name,lowlowLevel:i.lowlowLevel,lowLevel:i.lowLevel,highLevel:i.highLevel,highHighLevel:i.highHighLevel},e&&e.resetQueue&&o.bufferCommands){if(n.initQueue(o),u.settings.verbose){var t="Init Queue By External Node";o.warn(t),a(t)}i.resetStates(),i.showStatusActivities&&i.status({fill:"blue",shape:"ring",text:"active empty unit queue"}),e.queueOptions.state="queue reset done"}i.send(e)}),i.on("close",function(e){h.setNodeStatusTo("closed",i),i.queueReadInterval&&clearInterval(i.queueReadInterval),i.queueReadInterval=null,o.deregisterForModbus(i,e)}))})};
 //# sourceMappingURL=maps/modbus-queue-info.js.map

package.json

 {
   "name": "node-red-contrib-modbus",
-  "version": "5.5.0-beta.0",
+  "version": "5.5.0-beta.1",
   "private": false,
@@ -65,7 +65,7 @@ "description": "The all in one Modbus TCP and Serial contribution package for Node-RED.",
   "scripts": {
-    "test": "standard --fix && mocha test/* --reporter dot --timeout 5000",
+    "test": "standard --fix && mocha test --recursive --reporter dot --timeout 5000",
     "test-with-coverage": "istanbul cover _mocha --report lcovonly -- --recursive --timeout 5000 -R spec && cat ./coverage/lcov.info | codacy-coverage --token a047b284d2124df78f999c27ae874e9c && rm -rf ./coverage",
     "coverage": "standard --fix && gulp build && npm test && istanbul cover _mocha -- --recursive --timeout 5000",
     "build": "standard --fix && gulp",
-    "prepublishOnly": "standard --fix && npm run build && npm test && mocha test --recursive --timeout 5000 --reporter dot",
+    "prepublishOnly": "standard --fix && npm run build && npm test && mocha test --recursive --timeout 5000 --reporter dot && istanbul cover _mocha -- --recursive --timeout 5000",
     "ci-publish": "ci-publish",
@@ -72,0 +72,0 @@ "release": "standard-version -a",

No alert changes

Improved metrics

Total package byte prevSize

8270562

increased by0.15%

Lines of code

138439

increased by0.01%

No dependency changes