From c9312bd24d08271687d76da0fe3c83493871cf61 Mon Sep 17 00:00:00 2001 From: Matteo Collina Date: Fri, 7 Apr 2017 11:25:21 +0200 Subject: [PATCH] Use safe-buffer in place of new Buffer. --- package.json | 3 ++- stream.js | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 268eb88..3533277 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,13 @@ "duplexify": "^3.2.0", "inherits": "^2.0.1", "readable-stream": "^2.2.0", + "safe-buffer": "^5.0.1", "ws": "^2.2.3", "xtend": "^4.0.0" }, "devDependencies": { "beefy": "^2.1.1", - "browserify": "^5.11.1", + "browserify": "^14.0.0", "concat-stream": "^1.4.7", "tape": "^2.14.0" }, diff --git a/stream.js b/stream.js index 13fc4ac..5b4b59f 100644 --- a/stream.js +++ b/stream.js @@ -3,6 +3,7 @@ var Transform = require('readable-stream').Transform var duplexify = require('duplexify') var WS = require('ws') +var Buffer = require('safe-buffer').Buffer module.exports = WebSocketStream @@ -154,8 +155,8 @@ function WebSocketStream(target, protocols, options) { function onmessage(event) { var data = event.data - if (data instanceof ArrayBuffer) data = new Buffer(new Uint8Array(data)) - else data = new Buffer(data) + if (data instanceof ArrayBuffer) data = Buffer.from(new Uint8Array(data)) + else data = Buffer.from(data, 'utf8') proxy.push(data) } @@ -168,7 +169,7 @@ function WebSocketStream(target, protocols, options) { var buffers = new Array(chunks.length) for (var i = 0; i < chunks.length; i++) { if (typeof chunks[i].chunk === 'string') { - buffers[i] = new Buffer(chunks[i], 'utf8') // TODO use safe-buffer + buffers[i] = Buffer.from(chunks[i], 'utf8') } else { buffers[i] = chunks[i].chunk }