Skip to content

Commit

Permalink
streams: update .readable/.writable to false
Browse files Browse the repository at this point in the history
These properties were initially used to determine stream status
back in node v0.8 and earlier. Since streams2 however, these
properties were *always* true, which can be misleading for
example if you are trying to immediately determine whether
a Writable stream is still writable or not (to avoid a "write after
end" exception).

PR-URL: #4083
Reviewed-By: Chris Dickinson <[email protected]>
  • Loading branch information
mscdex authored and rvagg committed Dec 5, 2015
1 parent cb55c67 commit 1c1af81
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ function onEofChunk(stream, state) {
}
}
state.ended = true;
stream.readable = false;

// emit 'readable' now to make sure it gets picked up.
emitReadable(stream);
Expand Down Expand Up @@ -670,7 +671,7 @@ Readable.prototype.on = function(ev, fn) {
this.resume();
}

if (ev === 'readable' && this.readable) {
if (ev === 'readable' && !this._readableState.endEmitted) {
var state = this._readableState;
if (!state.readableListening) {
state.readableListening = true;
Expand Down
1 change: 1 addition & 0 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,4 +483,5 @@ function endWritable(stream, state, cb) {
stream.once('finish', cb);
}
state.ended = true;
stream.writable = false;
}
22 changes: 22 additions & 0 deletions test/parallel/test-stream2-compatibility.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use strict';
var common = require('../common');
var R = require('_stream_readable');
var W = require('_stream_writable');
var assert = require('assert');

var util = require('util');
Expand Down Expand Up @@ -29,4 +30,25 @@ var reader = new TestReader();
setImmediate(function() {
assert.equal(ondataCalled, 1);
console.log('ok');
reader.push(null);
});

function TestWriter() {
W.apply(this);
this.write('foo');
this.end();
}

util.inherits(TestWriter, W);

TestWriter.prototype._write = function(chunk, enc, cb) {
cb();
};

var writer = new TestWriter();

process.on('exit', function() {
assert.strictEqual(reader.readable, false);
assert.strictEqual(writer.writable, false);
console.log('ok');
});

0 comments on commit 1c1af81

Please sign in to comment.