stream: fix destroy(err, cb) regression

Fixed a regression that caused the callback passed to destroy() to not be called if the stream was already destroyed. This caused a regression on the ws module in CITGM introduced by #12925. PR-URL: #13156Fixes: websockets/ws#1118 Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Calvin Metcalf <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>

Author: mcollina

lib/internal/streams/destroy.js

@@ -8,7 +8,10 @@ function destroy(err, cb){
 this._writableState.destroyed;
 
 if(readableDestroyed||writableDestroyed){
-if(err&&(!this._writableState||!this._writableState.errorEmitted)){
+if(cb){
+cb(err);
+}elseif(err&&
+(!this._writableState||!this._writableState.errorEmitted)){
 process.nextTick(emitErrorNT,this,err);
 }
 return;

test/parallel/test-net-socket-destroy-send.js

@@ -0,0 +1,22 @@
+'use strict';
+
+constcommon=require('../common');
+constnet=require('net');
+constassert=require('assert');
+
+constserver=net.createServer();
+server.listen(0,common.mustCall(function(){
+constport=server.address().port;
+constconn=net.createConnection(port);
+
+conn.on('connect',common.mustCall(function(){
+conn.destroy();
+conn.on('error',common.mustCall(function(err){
+assert.strictEqual(err.message,'This socket is closed');
+}));
+conn.write(Buffer.from('kaboom'),common.mustCall(function(err){
+assert.strictEqual(err.message,'This socket is closed');
+}));
+server.close();
+}));
+}));

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

@@ -160,3 +160,17 @@ const{inherits } = require('util');
 
 newMyReadable();
 }
+
+{
+// destroy and destroy callback
+constread=newReadable({
+read(){}
+});
+read.resume();
+
+constexpected=newError('kaboom');
+
+read.destroy(expected,common.mustCall(function(err){
+assert.strictEqual(expected,err);
+}));
+}

test/parallel/test-stream-writable-destroy.js

@@ -170,3 +170,18 @@ const{inherits } = require('util');
 
 newMyWritable();
 }
+
+{
+// destroy and destroy callback
+constwrite=newWritable({
+write(chunk,enc,cb){cb();}
+});
+
+write.destroy();
+
+constexpected=newError('kaboom');
+
+write.destroy(expected,common.mustCall(function(err){
+assert.strictEqual(expected,err);
+}));
+}