Skip to content

Commit

Permalink
stream: add no-half-open enforcer only if needed
Browse files Browse the repository at this point in the history
The listener does not do anything if `allowHalfOpen` is enabled. Add it
only when `allowHalfOpen` is disabled.

PR-URL: #18953
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
lpinca authored and MylesBorins committed Mar 20, 2018
1 parent b01bd80 commit 9c0c0e6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 5 additions & 6 deletions lib/_stream_duplex.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ function Duplex(options) {
this.writable = false;

this.allowHalfOpen = true;
if (options && options.allowHalfOpen === false)
if (options && options.allowHalfOpen === false) {
this.allowHalfOpen = false;

this.once('end', onend);
this.once('end', onend);
}
}

Object.defineProperty(Duplex.prototype, 'writableHighWaterMark', {
Expand Down Expand Up @@ -96,9 +96,8 @@ Object.defineProperty(Duplex.prototype, 'writableLength', {

// the no-half-open enforcer
function onend() {
// if we allow half-open state, or if the writable side ended,
// then we're ok.
if (this.allowHalfOpen || this._writableState.ended)
// If the writable side ended, then we're ok.
if (this._writableState.ended)
return;

// no more data can be written.
Expand Down
2 changes: 2 additions & 0 deletions test/parallel/test-stream-duplex.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ const stream = new Duplex({ objectMode: true });
assert(Duplex() instanceof Duplex);
assert(stream._readableState.objectMode);
assert(stream._writableState.objectMode);
assert(stream.allowHalfOpen);
assert.strictEqual(stream.listenerCount('end'), 0);

let written;
let read;
Expand Down

0 comments on commit 9c0c0e6

Please sign in to comment.