node-zserial 1.0.7 → 1.0.9

package/package.json

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

package/zserial.js

@@ -229,9 +229,9 @@ module.exports = function (RED) {
                     });
                 }
             }
-            if (!msg.hasOwnProperty("payload")) { 
+            if (!msg.hasOwnProperty("payload")) {
                 done();
-                return; 
+                return;
             } // do nothing unless we have a payload
             if (msg.hasOwnProperty("count") && (typeof msg.count === "number") && (msg.serialConfig.out === "count")) {
                 msg.serialConfig.newline = msg.count;
@@ -307,33 +307,25 @@ module.exports = function (RED) {
         node.totalMsg = {};
         node.successMsg = {};
         node.errorMsg = {};
-        function zsend(msg, err, alldone, port,done) {
+        node._msg = null
+        function zsend(msg, err, alldone, port, done) {
 
+            let payload = msg || err;
+            node._msg.payload = payload;
+            node.totalMsg[port] = payload
             if (msg) {
-                node.successMsg[port] = {
-                    msg: msg,
-                }
+                node.successMsg[port] = msg
+                node.send([node._msg, null, null]);
             }
             if (err) {
-                node.errorMsg[port] = {
-                    err: err,
-                }
+                node.errorMsg[port] = err
+                node.send([null, node._msg, null]);
             }
-            if (node.totalMsg[port]) {
-                node.totalMsg[port] = Object.assign(node.totalMsg[port], {
-                    msg: msg || err,
-                })
-            } else {
-                node.totalMsg[port] = {
-                    msg: msg || err,
-                }
-            }
-
-            node.send([msg, err, alldone]);
             sendAll(done);
 
         }
         function onMsg(msg, send, done) {
+            node._msg = msg;
             if (!msg.serialConfigs) {
                 node.error("需要配置批量配置：msg.serialConfigs");
                 // zsend(msg, null, null)
@@ -344,10 +336,7 @@ module.exports = function (RED) {
             for (var i = 0; i < msg.serialConfigs.length; i++) {
                 var serialConfig = msg.serialConfigs[i];
                 serialConfig._msgid = msg._msgid + "_" + i;
-                // totalMsg[serialConfig.serialport] = {
-                //     serialConfig: serialConfig,
-                // };
-                getSerialServer(msg, serialConfig,done);
+                getSerialServer(msg, serialConfig, done);
             }
         }
 
@@ -355,11 +344,14 @@ module.exports = function (RED) {
             try {
                 let len = Object.keys(node.totalMsg).length;
                 if (len == node.totallenth) {
-                    node.send([null, null, {
+                    let payload = {
                         totalMsg: node.totalMsg,
                         successMsg: node.successMsg,
                         errorMsg: node.errorMsg,
-                    }]);
+                    }
+                    node.send([null, null,Object.assign({}, node._msg,{
+                        payload: payload
+                    })]);
                     done()
                 }
             } catch (error) {
@@ -368,7 +360,7 @@ module.exports = function (RED) {
             }
 
         }
-        function getSerialServer(msg, serialConfig,done) {
+        function getSerialServer(msg, serialConfig, done) {
             let curPort = serialPool.get(serialConfig);
 
             if (msg.hasOwnProperty("baudrate")) {
@@ -376,9 +368,8 @@ module.exports = function (RED) {
                 if (isNaN(baud)) {
                     // node.error(RED._("serial.errors.badbaudrate"), msg);
                     zsend(null, {
-                        msg: msg,
                         text: RED._("serial.errors.badbaudrate")
-                    }, null, curPort.serial.path,done)
+                    }, null, curPort.serial.path, done)
                 } else {
                     curPort.update({ baudRate: baud }, function (err, res) {
                         if (err) {
@@ -388,16 +379,15 @@ module.exports = function (RED) {
                                 status: "ERR_UPDATE",
                                 error: err,
                                 text: "更新波特率失败"
-                            }, null, curPort.serial.path,done)
+                            }, null, curPort.serial.path, done)
                         }
                     });
                 }
             }
             if (!serialConfig.hasOwnProperty("payload")) {
                 zsend(null, {
-                    msg: msg,
                     text: "No payload"
-                }, null, curPort.serial.path,done)
+                }, null, curPort.serial.path, done)
                 return;
             } // do nothing unless we have a payload
             if (msg.hasOwnProperty("count") && (typeof msg.count === "number") && (serialConfig.out === "count")) {
@@ -426,9 +416,9 @@ module.exports = function (RED) {
                         curPort._retryNum = 0
                         zsend(null, {
                             status: "ERR_IN_QUEUE",
-                            msg: '串口未打开，加入消息队列失败',
+                            text: '串口未打开，加入消息队列失败',
                             port: curPort.serial.path
-                        }, null, curPort.serial.path,done);
+                        }, null, curPort.serial.path, done);
                     }
                 } catch (error) {
                     node.error(error);
@@ -451,7 +441,7 @@ module.exports = function (RED) {
             curPort.on('data', function (msgout, sender) {
                 if (sender !== node) { return; }
                 msgout.status = "OK";
-                zsend(msgout, null, null, curPort.serial.path,done);
+                zsend(msgout, null, null, curPort.serial.path, done);
             });
             curPort.on('timeout', function (msgout, sender) {
                 if (sender !== node) { return; }
@@ -459,9 +449,8 @@ module.exports = function (RED) {
                 node.status({ fill: "red", shape: "ring", text: "timeout:::" + curPort.serial.path });
                 zsend(null, {
                     status: "ERR_TIMEOUT",
-                    msg: msgout,
                     port: curPort.serial.path
-                }, null, curPort.serial.path,done);
+                }, null, curPort.serial.path, done);
             });
 
             curPort.on('initerror', function (port, retryNum, olderr) {
@@ -470,7 +459,7 @@ module.exports = function (RED) {
                     text: `请检查端口是否打开,重试次数${retryNum}`,
                     error: olderr,
                     port: port
-                }, null, curPort.serial.path,done);
+                }, null, curPort.serial.path, done);
             });
 
 
@@ -480,7 +469,7 @@ module.exports = function (RED) {
                     status: "ERR_retry",
                     text: `重试${retryNum}失败`,
                     port: port
-                }, null, curPort.serial.path,done);
+                }, null, curPort.serial.path, done);
             });
 
             curPort.on('closed', function (port) {