node-zserial 1.0.10 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-zserial",
-    "version": "1.0.10",
+    "version": "1.0.12",
     "description": "Node-RED nodes to talk to serial ports",
     "dependencies": {
         "serialport": "^12.0.0"

package/zserial.js

@@ -269,6 +269,7 @@ module.exports = function (RED) {
             curPort.on('timeout', function (msgout, sender) {
                 if (sender !== node) { return; }
                 msgout.status = "ERR_TIMEOUT";
+                msgout.port = curPort.serial.path;
                 node.status({ fill: "red", shape: "ring", text: "timeout:::" + curPort.serial.path });
                 node.send(msgout);
                 if (done) done();
@@ -309,7 +310,9 @@ module.exports = function (RED) {
         node.errorMsg = {};
         node._msg = null
 
-        function initMsg() {
+        function initMsg(msg) {
+            node._msg = msg;
+            node.totallenth = msg.serialConfigs.length;
             node.totalMsg = {};
             node.successMsg = {};
             node.errorMsg = {};
@@ -319,6 +322,7 @@ module.exports = function (RED) {
             let payload = msg || err;
             node._msg.payload = payload;
             node.totalMsg[port] = payload
+
             if (msg) {
                 node.successMsg[port] = msg
                 node.send([node._msg, null, null]);
@@ -328,18 +332,17 @@ module.exports = function (RED) {
                 node.send([null, node._msg, null]);
             }
             sendAll(done);
-
         }
         function onMsg(msg, send, done) {
-            node._msg = msg;
-            initMsg();
+            
+            initMsg(msg);
             if (!msg.serialConfigs) {
                 node.error("需要配置批量配置：msg.serialConfigs");
                 // zsend(msg, null, null)
                 done();
                 return;
             }
-            node.totallenth = msg.serialConfigs.length;
+
             for (var i = 0; i < msg.serialConfigs.length; i++) {
                 var serialConfig = msg.serialConfigs[i];
                 serialConfig._msgid = msg._msgid + "_" + i;
@@ -350,6 +353,7 @@ module.exports = function (RED) {
         function sendAll(done) {
             try {
                 let len = Object.keys(node.totalMsg).length;
+
                 if (len == node.totallenth) {
                     let payload = {
                         totalMsg: node.totalMsg,
@@ -453,30 +457,28 @@ module.exports = function (RED) {
             curPort.on('timeout', function (msgout, sender) {
                 if (sender !== node) { return; }
                 msgout.status = "ERR_TIMEOUT";
+                msgout.port = curPort.serial.path;
                 node.status({ fill: "red", shape: "ring", text: "timeout:::" + curPort.serial.path });
-                zsend(null, {
-                    status: "ERR_TIMEOUT",
-                    port: curPort.serial.path
-                }, null, curPort.serial.path, done);
+                zsend(null,msgout, null, curPort.serial.path, done);
             });
 
             curPort.on('initerror', function (port, retryNum, olderr) {
-                zsend(null, {
-                    status: "ERR_INIT",
-                    text: `请检查端口是否打开,重试次数${retryNum}`,
-                    error: olderr,
-                    port: port
-                }, null, curPort.serial.path, done);
+                // zsend(null, {
+                //     status: "ERR_INIT",
+                //     text: `请检查端口是否打开,重试次数${retryNum}`,
+                //     error: olderr,
+                //     port: port
+                // }, null, curPort.serial.path, done);
             });
 
 
             curPort.on('retryerror', function (port, retryNum) {
-                curPort._retryNum = 0;
-                zsend(null, {
-                    status: "ERR_retry",
-                    text: `重试${retryNum}失败`,
-                    port: port
-                }, null, curPort.serial.path, done);
+                // curPort._retryNum = 0;
+                // zsend(null, {
+                //     status: "ERR_retry",
+                //     text: `重试${retryNum}失败`,
+                //     port: port
+                // }, null, curPort.serial.path, done);
             });
 
             curPort.on('closed', function (port) {
@@ -532,7 +534,7 @@ module.exports = function (RED) {
                     binoutput = serialConfig.bin || 'false',
                     addchar = serialConfig.addchar || '',
                     responsetimeout = serialConfig.responsetimeout || 10000,
-                    retryNum = serialConfig.retryNum || 3;
+                    retryNum = serialConfig.retryNum || 1;
                 var id = port;
                 // just return the connection object if already have one
                 // key is the port (file path)
@@ -667,9 +669,9 @@ module.exports = function (RED) {
                         obj._retryNum++;
                         RED.log.info(obj._retryNum)
                         if (obj._retryNum > retryNum) {
-                            serialPool.zlog("已经重试" + retryNum + "次，请检查串口是否正常！", {});
+                            // serialPool.zlog("已经重试" + retryNum + "次，请检查串口是否正常！", {});
                             obj._emitter.emit('retryerror', id, retryNum);
-                            return;
+                            return null;
                         }
                         obj.serial = new SerialPort({
                             path: port,