From e4d518749f41e2d19278e1ac6b837133fa351bb6 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 24 Oct 2018 13:45:34 +0100 Subject: [PATCH] Remove deprecated Buffer constructor usage Fixes #1709 --- .../@node-red/runtime/lib/nodes/credentials.js | 2 +- packages/node_modules/@node-red/util/lib/util.js | 2 +- test/nodes/core/core/58-debug_spec.js | 2 +- test/nodes/core/core/75-exec_spec.js | 4 ++-- test/nodes/core/core/80-function_spec.js | 2 +- test/nodes/core/io/21-httprequest_spec.js | 2 +- test/nodes/core/io/22-websocket_spec.js | 2 +- test/nodes/core/logic/17-split_spec.js | 10 +++++----- test/nodes/core/parsers/70-JSON_spec.js | 2 +- test/nodes/core/parsers/70-YAML_spec.js | 2 +- test/nodes/core/storage/50-file_spec.js | 4 ++-- .../@node-red/editor-api/lib/editor/ui_spec.js | 2 +- test/unit/@node-red/util/lib/util_spec.js | 16 ++++++++-------- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js index 5964e5617..355bd9bc5 100644 --- a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js +++ b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js @@ -34,7 +34,7 @@ var encryptionKey; function decryptCredentials(key,credentials) { var creds = credentials["$"]; - var initVector = new Buffer(creds.substring(0, 32),'hex'); + var initVector = Buffer.from(creds.substring(0, 32),'hex'); creds = creds.substring(32); var decipher = crypto.createDecipheriv(encryptionAlgorithm, key, initVector); var decrypted = decipher.update(creds, 'base64', 'utf8') + decipher.final('utf8'); diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js index facd55845..9c9c344d9 100644 --- a/packages/node_modules/@node-red/util/lib/util.js +++ b/packages/node_modules/@node-red/util/lib/util.js @@ -70,7 +70,7 @@ function ensureBuffer(o) { } else if (typeof o !== "string") { o = ""+o; } - return new Buffer(o); + return Buffer.from(o); } /** diff --git a/test/nodes/core/core/58-debug_spec.js b/test/nodes/core/core/58-debug_spec.js index e9dbd9de1..c35d7017e 100644 --- a/test/nodes/core/core/58-debug_spec.js +++ b/test/nodes/core/core/58-debug_spec.js @@ -506,7 +506,7 @@ describe('debug node', function() { helper.load(debugNode, flow, function() { var n1 = helper.getNode("n1"); websocket_test(function() { - n1.emit("input", {payload: new Buffer.from('HELLO', 'utf8')}); + n1.emit("input", {payload: Buffer.from('HELLO', 'utf8')}); }, function(msg) { JSON.parse(msg).should.eql([{ topic:"debug", diff --git a/test/nodes/core/core/75-exec_spec.js b/test/nodes/core/core/75-exec_spec.js index e526756cf..5b20dc658 100644 --- a/test/nodes/core/core/75-exec_spec.js +++ b/test/nodes/core/core/75-exec_spec.js @@ -177,7 +177,7 @@ describe('exec node', function() { function(arg1, arg2, arg3, arg4) { //console.log(arg1); // arg3(error,stdout,stderr); - arg3("error",new Buffer([0x01,0x02,0x03,0x88]),new Buffer([0x01,0x02,0x03,0x88])); + arg3("error",Buffer.from([0x01,0x02,0x03,0x88]),Buffer.from([0x01,0x02,0x03,0x88])); }); helper.load(execNode, flow, function() { var n1 = helper.getNode("n1"); @@ -595,7 +595,7 @@ describe('exec node', function() { } catch(err) { done(err); } }); - n1.receive({payload:new Buffer([0x01,0x02,0x03,0x88])}); + n1.receive({payload:Buffer.from([0x01,0x02,0x03,0x88])}); }); }); diff --git a/test/nodes/core/core/80-function_spec.js b/test/nodes/core/core/80-function_spec.js index 44b37b4dd..01e40c464 100644 --- a/test/nodes/core/core/80-function_spec.js +++ b/test/nodes/core/core/80-function_spec.js @@ -251,7 +251,7 @@ describe('function node', function() { testNonObjectMessage('return "foo"', done) }); it('should drop and log non-object message types - buffer', function(done) { - testNonObjectMessage('return new Buffer("hello")', done) + testNonObjectMessage('return Buffer.from("hello")', done) }); it('should drop and log non-object message types - array', function(done) { testNonObjectMessage('return [[[1,2,3]]]', done) diff --git a/test/nodes/core/io/21-httprequest_spec.js b/test/nodes/core/io/21-httprequest_spec.js index 1633d6c38..8c39d8eac 100644 --- a/test/nodes/core/io/21-httprequest_spec.js +++ b/test/nodes/core/io/21-httprequest_spec.js @@ -390,7 +390,7 @@ describe('HTTP Request Node', function() { done(err); } }); - n1.receive({payload:new Buffer('hello'), headers: { 'content-type': 'text/plain'}}); + n1.receive({payload:Buffer.from('hello'), headers: { 'content-type': 'text/plain'}}); }); }); diff --git a/test/nodes/core/io/22-websocket_spec.js b/test/nodes/core/io/22-websocket_spec.js index 18efbd028..40f6b21be 100644 --- a/test/nodes/core/io/22-websocket_spec.js +++ b/test/nodes/core/io/22-websocket_spec.js @@ -454,7 +454,7 @@ describe('websocket Node', function() { }); getSocket("n1").on("open", function() { helper.getNode("n3").send({ - payload: new Buffer("hello") + payload: Buffer.from("hello") }); }); }); diff --git a/test/nodes/core/logic/17-split_spec.js b/test/nodes/core/logic/17-split_spec.js index 2fc245dd8..f86023cfe 100644 --- a/test/nodes/core/logic/17-split_spec.js +++ b/test/nodes/core/logic/17-split_spec.js @@ -236,7 +236,7 @@ describe('SPLIT node', function() { done(err); } }); - var b = new Buffer.from("12345678"); + var b = Buffer.from("12345678"); sn1.receive({payload:b}); }); }); @@ -260,8 +260,8 @@ describe('SPLIT node', function() { done(err); } }); - var b1 = new Buffer.from("123412"); - var b2 = new Buffer.from("341234"); + var b1 = Buffer.from("123412"); + var b2 = Buffer.from("341234"); sn1.receive({payload:b1}); sn1.receive({payload:b2}); }); @@ -364,7 +364,7 @@ describe('SPLIT node', function() { if (msg.parts.index === 0) { msg.payload.length.should.equal(2); } if (msg.parts.index === 1) { msg.payload.length.should.equal(1); done(); } }); - var b = new Buffer.from("123"); + var b = Buffer.from("123"); sn1.receive({ payload: b }); }); }); @@ -382,7 +382,7 @@ describe('SPLIT node', function() { if (msg.parts.index === 0) { msg.payload.length.should.equal(2); } if (msg.parts.index === 1) { msg.payload.length.should.equal(1); done(); } }); - var b = new Buffer.from("123"); + var b = Buffer.from("123"); sn1.receive({ payload: b }); }); }); diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js index 1584ba566..2ff98850f 100644 --- a/test/nodes/core/parsers/70-JSON_spec.js +++ b/test/nodes/core/parsers/70-JSON_spec.js @@ -127,7 +127,7 @@ describe('JSON node', function() { },150); jn1.receive({payload:true}); jn1.receive({payload:1}); - jn1.receive({payload:new Buffer("a")}); + jn1.receive({payload:Buffer.from("a")}); }); }); diff --git a/test/nodes/core/parsers/70-YAML_spec.js b/test/nodes/core/parsers/70-YAML_spec.js index bb988fb04..925a52922 100644 --- a/test/nodes/core/parsers/70-YAML_spec.js +++ b/test/nodes/core/parsers/70-YAML_spec.js @@ -169,7 +169,7 @@ describe('YAML node', function() { },150); yn1.receive({payload:true}); yn1.receive({payload:1}); - yn1.receive({payload:new Buffer("a")}); + yn1.receive({payload:Buffer.from("a")}); }); }); diff --git a/test/nodes/core/storage/50-file_spec.js b/test/nodes/core/storage/50-file_spec.js index 4ec9b4fd0..1493ba165 100644 --- a/test/nodes/core/storage/50-file_spec.js +++ b/test/nodes/core/storage/50-file_spec.js @@ -574,7 +574,7 @@ describe('file Nodes', function() { } }); for(var i = 0; i < file_count; i++) { - var data = new Buffer(len); + var data = Buffer.alloc?Buffer.alloc(len):new Buffer(len); data.fill(i); var name = path.join(tmp_path, String(i)); var msg = {payload:data, filename:name}; @@ -617,7 +617,7 @@ describe('file Nodes', function() { } }); for(var i = 0; i < file_count; i++) { - var data = new Buffer(len); + var data = Buffer.alloc?Buffer.alloc(len):new Buffer(len); data.fill(i); var name = path.join(tmp_path, String(i)); var msg = {payload:data, filename:name}; diff --git a/test/unit/@node-red/editor-api/lib/editor/ui_spec.js b/test/unit/@node-red/editor-api/lib/editor/ui_spec.js index 9279b0957..672a9d204 100644 --- a/test/unit/@node-red/editor-api/lib/editor/ui_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/ui_spec.js @@ -84,7 +84,7 @@ describe("api/editor/ui", function() { res.data += chunk; }); res.on('end', function () { - callback(null, new Buffer(res.data, 'binary')); + callback(null, Buffer.from(res.data, 'binary')); }); } function compareBuffers(b1,b2) { diff --git a/test/unit/@node-red/util/lib/util_spec.js b/test/unit/@node-red/util/lib/util_spec.js index a95b5ea29..17304e811 100644 --- a/test/unit/@node-red/util/lib/util_spec.js +++ b/test/unit/@node-red/util/lib/util_spec.js @@ -59,9 +59,9 @@ describe("@node-red/util/util", function() { util.compareObjects({"b":1,"a":1},{"a":1,"b":1}).should.equal(true); }); it('Buffer', function() { - util.compareObjects(new Buffer("hello"),new Buffer("hello")).should.equal(true); - util.compareObjects(new Buffer("hello"),new Buffer("hello ")).should.equal(false); - util.compareObjects(new Buffer("hello"),"hello").should.equal(false); + util.compareObjects(Buffer.from("hello"),Buffer.from("hello")).should.equal(true); + util.compareObjects(Buffer.from("hello"),Buffer.from("hello ")).should.equal(false); + util.compareObjects(Buffer.from("hello"),"hello").should.equal(false); }); }); @@ -71,7 +71,7 @@ describe("@node-red/util/util", function() { util.ensureString('string').should.equal('string'); }); it('Buffer is converted', function() { - var s = util.ensureString(new Buffer('foo')); + var s = util.ensureString(Buffer.from('foo')); s.should.equal('foo'); (typeof s).should.equal('string'); }); @@ -89,12 +89,12 @@ describe("@node-red/util/util", function() { describe('ensureBuffer', function() { it('Buffers are preserved', function() { - var b = new Buffer(''); + var b = Buffer.from(''); util.ensureBuffer(b).should.equal(b); }); it('string is converted', function() { var b = util.ensureBuffer('foo'); - var expected = new Buffer('foo'); + var expected = Buffer.from('foo'); for (var i = 0; i < expected.length; i++) { b[i].should.equal(expected[i]); } @@ -109,7 +109,7 @@ describe("@node-red/util/util", function() { it('stringifies other things', function() { var b = util.ensureBuffer(123); Buffer.isBuffer(b).should.equal(true); - var expected = new Buffer('123'); + var expected = Buffer.from('123'); for (var i = 0; i < expected.length; i++) { b[i].should.equal(expected[i]); } @@ -747,7 +747,7 @@ describe("@node-red/util/util", function() { resultJson[2].data.should.eql('-Infinity'); }); it('constructor of Buffer in msg', function() { - var msg = { msg:{buffer:new Buffer([1,2,3,4])} }; + var msg = { msg:{buffer:Buffer.from([1,2,3,4])} }; var result = util.encodeObject(msg,{maxLength:2}); result.format.should.eql("Object"); var resultJson = JSON.parse(result.msg);