Skip to content

Commit c9312bd

Browse files
committed
Use safe-buffer in place of new Buffer.
1 parent 073a2cc commit c9312bd

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@
2626
"duplexify": "^3.2.0",
2727
"inherits": "^2.0.1",
2828
"readable-stream": "^2.2.0",
29+
"safe-buffer": "^5.0.1",
2930
"ws": "^2.2.3",
3031
"xtend": "^4.0.0"
3132
},
3233
"devDependencies": {
3334
"beefy": "^2.1.1",
34-
"browserify": "^5.11.1",
35+
"browserify": "^14.0.0",
3536
"concat-stream": "^1.4.7",
3637
"tape": "^2.14.0"
3738
},

stream.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
var Transform = require('readable-stream').Transform
44
var duplexify = require('duplexify')
55
var WS = require('ws')
6+
var Buffer = require('safe-buffer').Buffer
67

78
module.exports = WebSocketStream
89

@@ -154,8 +155,8 @@ function WebSocketStream(target, protocols, options) {
154155

155156
function onmessage(event) {
156157
var data = event.data
157-
if (data instanceof ArrayBuffer) data = new Buffer(new Uint8Array(data))
158-
else data = new Buffer(data)
158+
if (data instanceof ArrayBuffer) data = Buffer.from(new Uint8Array(data))
159+
else data = Buffer.from(data, 'utf8')
159160
proxy.push(data)
160161
}
161162

@@ -168,7 +169,7 @@ function WebSocketStream(target, protocols, options) {
168169
var buffers = new Array(chunks.length)
169170
for (var i = 0; i < chunks.length; i++) {
170171
if (typeof chunks[i].chunk === 'string') {
171-
buffers[i] = new Buffer(chunks[i], 'utf8') // TODO use safe-buffer
172+
buffers[i] = Buffer.from(chunks[i], 'utf8')
172173
} else {
173174
buffers[i] = chunks[i].chunk
174175
}

0 commit comments

Comments
 (0)