use safe-buffer (#282)

use safe-buffer

build/common-replacements.js

@@ -44,7 +44,7 @@ module.exports.objectKeysReplacement = [
 module.exports.bufferShimFix = [
   /^('use strict';)$/m,
   `/*<replacement>*/
- const bufferShim = require('buffer-shims');
+ const bufferShim = require('safe-buffer').Buffer;
  /*</replacement>*/`
 ]
 

build/files.js

@@ -159,17 +159,12 @@ const headRegexp = /(^module.exports = \w+;?)/m
 
       `
     ]
-  , bufferShimFix = [
+  , safeBufferFix = [
     /const Buffer = require\('buffer'\)\.Buffer;/,
-    `const Buffer = require('buffer').Buffer;
-/*<replacement>*/
-  const bufferShim = require('buffer-shims');
+    `/*<replacement>*/
+  const Buffer = require('safe-buffer').Buffer
 /*</replacement>*/`
   ]
-  , bufferStaticMethods = [
-    /Buffer\.((?:alloc)|(?:allocUnsafe)|(?:from))/g,
-    `bufferShim.$1`
-  ]
   , internalDirectory = [
     /require\('internal\/streams\/BufferList'\)/,
     'require(\'./internal/streams/BufferList\')'
@@ -238,8 +233,7 @@ module.exports['_stream_readable.js'] = [
   , processNextTickImport
   , processNextTickReplacement
   , eventEmittterListenerCountReplacement
-  , bufferShimFix
-  , bufferStaticMethods
+  , safeBufferFix
   , internalDirectory
 ]
 
@@ -270,14 +264,12 @@ module.exports['_stream_writable.js'] = [
   , processNextTickReplacement
   , internalUtilReplacement
   , fixSyncWrite
-  , bufferShimFix
-  , bufferStaticMethods
+  , safeBufferFix
   , fixInstanceCheck
   , removeOnWriteBind
   , removeCorkedFinishBind
   , removeOnCorkedFinish
 ]
 module.exports['internal/streams/BufferList.js'] = [
-    bufferShimFix
-  , bufferStaticMethods
+    safeBufferFix
 ]

lib/_stream_readable.js

@@ -28,9 +28,8 @@ var EElistenerCount = function (emitter, type) {
 var Stream = require('./internal/streams/stream');
 /*</replacement>*/
 
-var Buffer = require('buffer').Buffer;
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 /*</replacement>*/
 
 /*<replacement>*/
@@ -163,7 +162,7 @@ Readable.prototype.push = function (chunk, encoding) {
   if (!state.objectMode && typeof chunk === 'string') {
     encoding = encoding || state.defaultEncoding;
     if (encoding !== state.encoding) {
-      chunk = bufferShim.from(chunk, encoding);
+      chunk = Buffer.from(chunk, encoding);
       encoding = '';
     }
   }
@@ -873,7 +872,7 @@ function copyFromBufferString(n, list) {
 // This function is designed to be inlinable, so please take care when making
 // changes to the function body.
 function copyFromBuffer(n, list) {
-  var ret = bufferShim.allocUnsafe(n);
+  var ret = Buffer.allocUnsafe(n);
   var p = list.head;
   var c = 1;
   p.data.copy(ret);

lib/_stream_writable.js

@@ -35,9 +35,8 @@ var internalUtil = {
 var Stream = require('./internal/streams/stream');
 /*</replacement>*/
 
-var Buffer = require('buffer').Buffer;
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var Buffer = require('safe-buffer').Buffer;
 /*</replacement>*/
 
 util.inherits(Writable, Stream);
@@ -293,7 +292,7 @@ Writable.prototype.setDefaultEncoding = function setDefaultEncoding(encoding) {
 
 function decodeChunk(state, chunk, encoding) {
   if (!state.objectMode && state.decodeStrings !== false && typeof chunk === 'string') {
-    chunk = bufferShim.from(chunk, encoding);
+    chunk = Buffer.from(chunk, encoding);
   }
   return chunk;
 }

lib/internal/streams/BufferList.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var Buffer = require('buffer').Buffer;
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+
+var Buffer = require('safe-buffer').Buffer;
 /*</replacement>*/
 
 module.exports = BufferList;
@@ -50,9 +50,9 @@ BufferList.prototype.join = function (s) {
 };
 
 BufferList.prototype.concat = function (n) {
-  if (this.length === 0) return bufferShim.alloc(0);
+  if (this.length === 0) return Buffer.alloc(0);
   if (this.length === 1) return this.head.data;
-  var ret = bufferShim.allocUnsafe(n >>> 0);
+  var ret = Buffer.allocUnsafe(n >>> 0);
   var p = this.head;
   var i = 0;
   while (p) {

package.json

@@ -4,11 +4,11 @@
   "description": "Streams3, a user-land copy of the stream library from Node.js",
   "main": "readable.js",
   "dependencies": {
-    "buffer-shims": "~1.0.0",
     "core-util-is": "~1.0.0",
-    "isarray": "~1.0.0",
     "inherits": "~2.0.1",
+    "isarray": "~1.0.0",
     "process-nextick-args": "~1.0.6",
+    "safe-buffer": "^5.0.1",
     "string_decoder": "~1.0.0",
     "util-deprecate": "~1.0.1"
   },

test/parallel/test-stream-big-packet.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-big-push.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-buffer-list.js

@@ -1,6 +1,6 @@
 // Flags: --expose_internals
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-decoder-objectmode.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var stream = require('../../');

test/parallel/test-stream-duplex.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-end-paused.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-events-prepend.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-ispaused.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-pipe-after-end.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-pipe-await-drain-manual-resume.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-await-drain-push-while-write.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-await-drain.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-cleanup-pause.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-cleanup.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 // This test asserts that Stream.prototype.pipe does not leave listeners
 // hanging on the source or dest.

test/parallel/test-stream-pipe-error-handling.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-pipe-event.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-multiple-pipes.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-pipe-unpipe-streams.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-pipe-without-listenerCount.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var stream = require('../../');

test/parallel/test-stream-push-order.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var Readable = require('../../').Readable;

test/parallel/test-stream-push-strings.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-constructor-set-methods.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-emittedReadable.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-event.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-flow-recursion.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-invalid-chunk.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var stream = require('../../');

test/parallel/test-stream-readable-needReadable.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-reading-readingMore.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-readable-resumeScheduled.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 

test/parallel/test-stream-readable-with-unimplemented-_read.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var stream = require('../../');

test/parallel/test-stream-readableListening-state.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 
 var common = require('../common');

test/parallel/test-stream-transform-constructor-set-methods.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-transform-flush-data.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 
 require('../common');

test/parallel/test-stream-transform-objectmode-falsey-value.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 var common = require('../common');
 var assert = require('assert/');

test/parallel/test-stream-transform-split-objectmode.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');

test/parallel/test-stream-unshift-empty-chunk.js

@@ -1,5 +1,5 @@
 /*<replacement>*/
-var bufferShim = require('buffer-shims');
+var bufferShim = require('safe-buffer').Buffer;
 /*</replacement>*/
 require('../common');
 var assert = require('assert/');