bl 2.2.1 → 3.0.0

package/.travis.yml

@@ -1,10 +1,8 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
   - '6'
   - '8'
-  - '9'
   - '10'
 branches:
   only:

package/bl.js

@@ -1,7 +1,6 @@
 'use strict'
 var DuplexStream = require('readable-stream').Duplex
   , util         = require('util')
-  , Buffer       = require('safe-buffer').Buffer
 
 function BufferList (callback) {
   if (!(this instanceof BufferList))
@@ -186,22 +185,18 @@ BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) {
 
     if (bytes > l) {
       this._bufs[i].copy(dst, bufoff, start)
-      bufoff += l
     } else {
       this._bufs[i].copy(dst, bufoff, start, start + bytes)
-      bufoff += l
       break
     }
 
+    bufoff += l
     bytes -= l
 
     if (start)
       start = 0
   }
 
-  // safeguard so that we don't return uninitialized memory
-  if (dst.length > bufoff) return dst.slice(0, bufoff)
-
   return dst
 }
 
@@ -237,11 +232,6 @@ BufferList.prototype.toString = function toString (encoding, start, end) {
 }
 
 BufferList.prototype.consume = function consume (bytes) {
-  // first, normalize the argument, in accordance with how Buffer does it
-  bytes = Math.trunc(bytes)
-  // do nothing if not a positive number
-  if (Number.isNaN(bytes) || bytes <= 0) return this
-
   while (this._bufs.length) {
     if (bytes >= this._bufs[0].length) {
       bytes -= this._bufs[0].length
@@ -268,10 +258,10 @@ BufferList.prototype.duplicate = function duplicate () {
 }
 
 
-BufferList.prototype.destroy = function destroy () {
+BufferList.prototype._destroy = function _destroy (err, cb) {
   this._bufs.length = 0
   this.length = 0
-  this.push(null)
+  cb(err)
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl",
-  "version": "2.2.1",
+  "version": "3.0.0",
   "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
   "main": "bl.js",
   "scripts": {
@@ -24,12 +24,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "readable-stream": "^2.3.5",
-    "safe-buffer": "^5.1.1"
+    "readable-stream": "^3.0.1"
   },
   "devDependencies": {
     "faucet": "0.0.1",
     "hash_file": "~0.1.1",
-    "tape": "~4.9.0"
+    "tape": "~4.9.1"
   }
 }

package/test/test.js

@@ -431,22 +431,6 @@ tape('test toString encoding', function (t) {
   t.end()
 })
 
-tape('uninitialized memory', function (t) {
-  const secret = crypto.randomBytes(256)
-  for (let i = 0; i < 1e6; i++) {
-    const clone = Buffer.from(secret)
-    const bl = new BufferList()
-    bl.append(Buffer.from('a'))
-    bl.consume(-1024)
-    const buf = bl.slice(1)
-    if (buf.indexOf(clone) !== -1) {
-      t.fail(`Match (at ${i})`)
-      break
-    }
-  }
-  t.end()
-})
-
 !process.browser && tape('test stream', function (t) {
   var random = crypto.randomBytes(65534)
     , rndhash = hash(random, 'md5')
@@ -699,6 +683,20 @@ tape('destroy no pipe', function (t) {
   t.equal(bl.length, 0)
 })
 
+tape('destroy with error', function (t) {
+  t.plan(3)
+
+  var bl = new BufferList('alsdkfja;lsdkfja;lsdk')
+  var err = new Error('kaboom')
+  bl.destroy(err)
+  bl.on('error', function (_err) {
+    t.equal(_err, err)
+  })
+
+  t.equal(bl._bufs.length, 0)
+  t.equal(bl.length, 0)
+})
+
 !process.browser && tape('destroy with pipe before read end', function (t) {
   t.plan(2)