Skip to content
Permalink
Browse files

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: #13156
Fixes: websockets/ws#1118
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Calvin Metcalf <calvin.metcalf@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information...
mcollina authored and jasnell committed May 22, 2017
1 parent b6e1d22 commit 87cef63ccbbc3db875c4d4e98c42d90623c2ed0e
@@ -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);
} else if (err &&
(!this._writableState || !this._writableState.errorEmitted)) {
process.nextTick(emitErrorNT, this, err);
}
return;
@@ -0,0 +1,22 @@
'use strict';

const common = require('../common');
const net = require('net');
const assert = require('assert');

const server = net.createServer();
server.listen(0, common.mustCall(function() {
const port = server.address().port;
const conn = 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();
}));
}));
@@ -160,3 +160,17 @@ const { inherits } = require('util');

new MyReadable();
}

{
// destroy and destroy callback
const read = new Readable({
read() {}
});
read.resume();

const expected = new Error('kaboom');

read.destroy(expected, common.mustCall(function(err) {
assert.strictEqual(expected, err);
}));
}
@@ -170,3 +170,18 @@ const { inherits } = require('util');

new MyWritable();
}

{
// destroy and destroy callback
const write = new Writable({
write(chunk, enc, cb) { cb(); }
});

write.destroy();

const expected = new Error('kaboom');

write.destroy(expected, common.mustCall(function(err) {
assert.strictEqual(expected, err);
}));
}

0 comments on commit 87cef63

Please sign in to comment.
You can’t perform that action at this time.