Skip to content

stream: add isDisturbed helper #39628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronag wants to merge 6 commits into from
Closed

stream: add isDisturbed helper #39628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d363920
stream: add isDisturbed helper
ronag Aug 2, 2021
ac0a1df
fixup
ronag Aug 2, 2021
8673e33
fixup
ronag Aug 3, 2021
caa8e3b
fixup: readableDidRead readableAborted
ronag Aug 3, 2021
13123c4
fixup
ronag Aug 3, 2021
0dda118
fixup
ronag Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@ronag
ronag committed Aug 3, 2021
commit 13123c46cb91e7e8aaa9d6210409bcaffe13f661
2 changes: 1 addition & 1 deletion doc/api/stream.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,7 @@ added: REPLACEME

* {boolean}

Returns whether the stream was destroyed before `'end'` has been emitted.
Returns whether the stream was destroyed or errored before emitting `'end'`.

##### `readable.readableDidRead`
<!-- YAML
Expand Down
12 changes: 3 additions & 9 deletions lib/internal/streams/readable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ function ReadableState(options, stream, isDuplex) {

this.dataEmitted = false;

this.aborted = false;

this.decoder = null;
this.encoding = null;
if (options && options.encoding) {
Expand Down Expand Up @@ -217,12 +215,7 @@ function Readable(options) {
});
}

Readable.prototype.destroy = function(err) {
if (!this._readableState.endEmitted) {
this._readableState.aborted = true;
}
destroyImpl.destroy.call(this, err);
};
Readable.prototype.destroy = destroyImpl.destroy;
Readable.prototype._undestroy = destroyImpl.undestroy;
Readable.prototype._destroy = function(err, cb) {
cb(err);
Expand Down Expand Up @@ -1199,7 +1192,8 @@ ObjectDefineProperties(Readable.prototype, {
readableAborted: {
enumerable: false,
get: function() {
return this._readableState.aborted;
return (this._readableState.destroyed || this._readableState.errored) &&
!this._readableState.endEmitted;
}
},

Expand Down