tls: make StreamWrap work correctly in "drain" callback

When an instance of StreamWrap is shutting down and a "drain" event
is emitted, the instance will abort as its
`this[kCurrentShutdownRequest]` is already set. The following test
will fail before this commit.

PR-URL: https://github.com/nodejs/node/pull/23294
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
This commit is contained in:
Ouyang Yadong 2018-10-07 21:18:15 +08:00 committed by Daniel Bevenius
parent 7cc0b3cad5
commit e4dea40ce7
2 changed files with 53 additions and 4 deletions

View File

@ -100,9 +100,6 @@ class JSStreamWrap extends Socket {
}
doShutdown(req) {
assert.strictEqual(this[kCurrentShutdownRequest], null);
this[kCurrentShutdownRequest] = req;
// TODO(addaleax): It might be nice if we could get into a state where
// DoShutdown() is not called on streams while a write is still pending.
//
@ -113,8 +110,10 @@ class JSStreamWrap extends Socket {
// so for now that is supported here.
if (this[kCurrentWriteRequest] !== null)
return this.on('drain', () => this.doShutdown(req));
return this.once('drain', () => this.doShutdown(req));
assert.strictEqual(this[kCurrentWriteRequest], null);
assert.strictEqual(this[kCurrentShutdownRequest], null);
this[kCurrentShutdownRequest] = req;
const handle = this._handle;

View File

@ -0,0 +1,50 @@
// Flags: --expose-internals
'use strict';
const common = require('../common');
const assert = require('assert');
const { StreamWrap } = require('_stream_wrap');
const { Duplex } = require('stream');
const { internalBinding } = require('internal/test/binding');
const { ShutdownWrap } = internalBinding('stream_wrap');
// This test makes sure that when an instance of JSStreamWrap is waiting for
// a "drain" event to `doShutdown`, the instance will work correctly when a
// "drain" event emitted.
{
let resolve = null;
class TestDuplex extends Duplex {
_write(chunk, encoding, callback) {
// We will resolve the write later.
resolve = () => {
callback();
};
}
_read() {}
}
const testDuplex = new TestDuplex();
const socket = new StreamWrap(testDuplex);
socket.write(
// Make the buffer long enough so that the `Writable` will emit "drain".
Buffer.allocUnsafe(socket.writableHighWaterMark * 2),
common.mustCall()
);
// Make sure that the 'drain' events will be emitted.
testDuplex.on('drain', common.mustCall(() => {
console.log('testDuplex drain');
}));
assert.strictEqual(typeof resolve, 'function');
const req = new ShutdownWrap();
req.oncomplete = common.mustCall();
req.handle = socket._handle;
// Should not throw.
socket._handle.shutdown(req);
resolve();
}