From f6e71bf962dcf8c12b0e0fd9180c48c88fecb386 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Fri, 30 Jun 2017 19:52:20 +0100 Subject: [PATCH] "revert" serial port and base64 nodes forwards.... undo buffer syntax updates --- io/serialport/25-serial.js | 18 +++++++++--------- io/serialport/package.json | 2 +- parsers/base64/70-base64.js | 4 ++-- parsers/base64/package.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/io/serialport/25-serial.js b/io/serialport/25-serial.js index 24c11696..0f9a9bc4 100644 --- a/io/serialport/25-serial.js +++ b/io/serialport/25-serial.js @@ -52,7 +52,7 @@ module.exports = function(RED) { payload += node.addCh; } else if (node.addCh !== "") { - payload = Buffer.concat([payload,new Buffer.from(node.addCh)]); + payload = Buffer.concat([payload,new Buffer(node.addCh)]); } node.port.write(payload,function(err,res) { if (err) { @@ -94,8 +94,8 @@ module.exports = function(RED) { var node = this; node.tout = null; var buf; - if (node.serialConfig.out != "count") { buf = new Buffer.alloc(bufMaxSize); } - else { buf = new Buffer.alloc(Number(node.serialConfig.newline)); } + if (node.serialConfig.out != "count") { buf = new Buffer(bufMaxSize); } + else { buf = new Buffer(Number(node.serialConfig.newline)); } var i = 0; node.status({fill:"grey",shape:"dot",text:"node-red:common.status.not-connected"}); node.port = serialPool.get(this.serialConfig.serialport, @@ -108,17 +108,17 @@ module.exports = function(RED) { var splitc; if (node.serialConfig.newline.substr(0,2) == "0x") { - splitc = new Buffer.from([parseInt(node.serialConfig.newline)]); + splitc = new Buffer([parseInt(node.serialConfig.newline)]); } else { - splitc = new Buffer.from(node.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0")); // jshint ignore:line + splitc = new Buffer(node.serialConfig.newline.replace("\\n","\n").replace("\\r","\r").replace("\\t","\t").replace("\\e","\e").replace("\\f","\f").replace("\\0","\0")); // jshint ignore:line } this.port.on('data', function(msg) { // single char buffer if ((node.serialConfig.newline === 0)||(node.serialConfig.newline === "")) { if (node.serialConfig.bin !== "bin") { node.send({"payload": String.fromCharCode(msg)}); } - else { node.send({"payload": new Buffer.from([msg])}); } + else { node.send({"payload": new Buffer([msg])}); } } else { // do the timer thing @@ -130,7 +130,7 @@ module.exports = function(RED) { else { node.tout = setTimeout(function () { node.tout = null; - var m = new Buffer.alloc(i+1); + var m = new Buffer(i+1); buf.copy(m,0,0,i+1); if (node.serialConfig.bin !== "bin") { m = m.toString(); } node.send({"payload": m}); @@ -145,7 +145,7 @@ module.exports = function(RED) { buf[i] = msg; i += 1; if ( i >= parseInt(node.serialConfig.newline)) { - var m = new Buffer.alloc(i); + var m = new Buffer(i); buf.copy(m,0,0,i); if (node.serialConfig.bin !== "bin") { m = m.toString(); } node.send({"payload":m}); @@ -158,7 +158,7 @@ module.exports = function(RED) { buf[i] = msg; i += 1; if ((msg === splitc[0]) || (i === bufMaxSize)) { - var n = new Buffer.alloc(i); + var n = new Buffer(i); buf.copy(n,0,0,i); if (node.serialConfig.bin !== "bin") { n = n.toString(); } node.send({"payload":n}); diff --git a/io/serialport/package.json b/io/serialport/package.json index 3ca3a7aa..ea71a8f9 100644 --- a/io/serialport/package.json +++ b/io/serialport/package.json @@ -1,6 +1,6 @@ { "name" : "node-red-node-serialport", - "version" : "0.4.3", + "version" : "0.4.4", "description" : "Node-RED nodes to talk to serial ports", "dependencies" : { "serialport" : "~4.0.7" diff --git a/parsers/base64/70-base64.js b/parsers/base64/70-base64.js index 224e9dc9..319f7716 100644 --- a/parsers/base64/70-base64.js +++ b/parsers/base64/70-base64.js @@ -16,12 +16,12 @@ module.exports = function(RED) { // Take base64 string and make into binary buffer var regexp = new RegExp('^[A-Za-z0-9+\/=]*$'); if ( regexp.test(msg.payload) && (msg.payload.length % 4 === 0) ) { - msg.payload = new Buffer.from(msg.payload,'base64'); + msg.payload = new Buffer(msg.payload,'base64'); node.send(msg); } else { //node.log("Not a Base64 string - maybe we should encode it..."); - msg.payload = (new Buffer.from(msg.payload,"binary")).toString('base64'); + msg.payload = (new Buffer(msg.payload,"binary")).toString('base64'); node.send(msg); } } diff --git a/parsers/base64/package.json b/parsers/base64/package.json index bf29e399..204c6a7a 100644 --- a/parsers/base64/package.json +++ b/parsers/base64/package.json @@ -1,6 +1,6 @@ { "name" : "node-red-node-base64", - "version" : "0.0.5", + "version" : "0.0.6", "description" : "A Node-RED node to pack and unpack objects to base64 format", "dependencies" : { },