Can call destroy twice

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1.2 2018-02-05
+
+  * Can call `destroy` twice.
+
 ## v3.1.1 2018-02-04
 
   * Minor bugfix in README.

lib/promise-readable.js

@@ -190,12 +190,16 @@ class PromiseReadable {
   }
 
   destroy () {
-    this.stream.removeListener('error', this._errorHandler)
-    delete this._errorHandler
-    if (typeof this.stream.destroy === 'function') {
-      this.stream.destroy()
+    if (this._errorHandler) {
+      this.stream.removeListener('error', this._errorHandler)
+      delete this._errorHandler
+    }
+    if (this.stream) {
+      if (typeof this.stream.destroy === 'function') {
+        this.stream.destroy()
+      }
+      delete this.stream
     }
-    delete this.stream
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "promise-readable",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Return promise for readable stream",
   "main": "lib/promise-readable.js",
   "typings": "lib/promise-readable.d.ts",

test/promise-readable.js

@@ -98,6 +98,14 @@ Feature('Test promise-readable module with stream2 API', () => {
     Then('promise returns another chunk', () => {
       return promise.should.eventually.deep.equal(Buffer.from('chunk2'))
     })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
   })
 
   Scenario('Read chunks from stream with encoding', () => {
@@ -240,6 +248,14 @@ Feature('Test promise-readable module with stream2 API', () => {
     Then('promise returns undefined value', () => {
       return promise.should.eventually.to.be.undefined
     })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
   })
 
   Scenario('Read stream with error', () => {
@@ -266,6 +282,14 @@ Feature('Test promise-readable module with stream2 API', () => {
     Then('promise is rejected', () => {
       return promise.should.be.rejectedWith(Error, 'boom')
     })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
+
+    And('PromiseReadable object can be destroyed', () => {
+      promiseReadable.destroy()
+    })
   })
 
   Scenario('Read stream with emitted error', () => {