From e0391b5390f4d17674adc865bfe2e97534c4117e Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Mon, 11 Jun 2018 23:51:25 -0500 Subject: [PATCH 1/3] new Buffer -> Buffer.from --- src/scripts/interceptor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/interceptor.js b/src/scripts/interceptor.js index 67bd6706..53e17c51 100644 --- a/src/scripts/interceptor.js +++ b/src/scripts/interceptor.js @@ -166,7 +166,7 @@ } else { data = data.toString().replace(/\n/g, '\r\n'); - return new Buffer(data, typeof encoding === 'string' ? encoding : 'utf8'); + return Buffer.from(data, typeof encoding === 'string' ? encoding : 'utf8'); } }; @@ -207,4 +207,4 @@ // run the original application entry point -require(process.argv[1]); \ No newline at end of file +require(process.argv[1]); From 83fd0c8a5dc31226ffc5962c9ec59e8fba58e618 Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Mon, 11 Jun 2018 23:58:26 -0500 Subject: [PATCH 2/3] backwards compatible --- src/scripts/interceptor.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scripts/interceptor.js b/src/scripts/interceptor.js index 53e17c51..3ea1054a 100644 --- a/src/scripts/interceptor.js +++ b/src/scripts/interceptor.js @@ -166,7 +166,12 @@ } else { data = data.toString().replace(/\n/g, '\r\n'); - return Buffer.from(data, typeof encoding === 'string' ? encoding : 'utf8'); + encoding = (typeof encoding === 'string' ? encoding : 'utf8'); + if (Buffer.hasOwnProperty('from')) { + return Buffer.from(data, encoding); + } else { + return new Buffer(data, encoding); + } } }; From 30c7922132c5072117f24c8fa15b1c6ebdc7846f Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Tue, 12 Jun 2018 00:03:49 -0500 Subject: [PATCH 3/3] untabify --- src/scripts/interceptor.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scripts/interceptor.js b/src/scripts/interceptor.js index 3ea1054a..9f3f7447 100644 --- a/src/scripts/interceptor.js +++ b/src/scripts/interceptor.js @@ -166,12 +166,12 @@ } else { data = data.toString().replace(/\n/g, '\r\n'); - encoding = (typeof encoding === 'string' ? encoding : 'utf8'); - if (Buffer.hasOwnProperty('from')) { + encoding = (typeof encoding === 'string' ? encoding : 'utf8'); + if (Buffer.hasOwnProperty('from')) { return Buffer.from(data, encoding); - } else { - return new Buffer(data, encoding); - } + } else { + return new Buffer(data, encoding); + } } };