stream: add isErrored helper

Refs: https://github.com/nodejs/undici/pull/1134

PR-URL: https://github.com/nodejs/node/pull/41121
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
This commit is contained in:
Robert Nagy committed 2021-12-16 14:28:31 +01:00
1 parent a3195f20cd
commit 752d75d8bc
7 files changed
+64 -7

No files matched your search

+13
View File
@@ -2225,6 +2225,19 @@ added: v16.8.0
Returns whether the stream has been read from or cancelled.
### `stream.isErrored(stream)`
<!-- YAML
added: REPLACEME
-->
> Stability: 1 - Experimental
* `stream` {Readable|Writable|Duplex|WritableStream|ReadableStream}
* Returns: {boolean}
Returns whether the stream has encountered an error.
### `stream.Readable.toWeb(streamReadable)`
<!-- YAML
+17 -3
View File
@@ -7,6 +7,7 @@ const {
} = primordials;
const kDestroyed = Symbol('kDestroyed');
const kIsErrored = Symbol('kIsErrored');
const kIsDisturbed = Symbol('kIsDisturbed');
function isReadableNodeStream(obj, strict = false) {
@@ -239,16 +240,29 @@ function willEmitClose(stream) {
function isDisturbed(stream) {
return !!(stream && (
stream.readableDidRead ||
stream.readableAborted ||
stream[kIsDisturbed]
stream[kIsDisturbed] ??
(stream.readableDidRead || stream.readableAborted)
));
}
function isErrored(stream) {
return !!(stream && (
stream[kIsErrored] ??
stream.readableErrored ??
stream.writableErrored ??
stream._readableState?.errorEmitted ??
stream._writableState?.errorEmitted ??
stream._readableState?.errored ??
stream._writableState?.errored
));
}
module.exports = {
kDestroyed,
isDisturbed,
isErrored,
kIsDisturbed,
kIsErrored,
isClosed,
isDestroyed,
isDuplexNodeStream,
@@ -82,6 +82,7 @@ const {
const {
kIsDisturbed,
kIsErrored,
} = require('internal/streams/utils');
const {
@@ -241,6 +242,10 @@ class ReadableStream {
return this[kState].disturbed;
}
get [kIsErrored]() {
return this[kState].state === 'errored';
}
/**
* @readonly
* @type {boolean}
+3 -1
View File
@@ -36,9 +36,11 @@ const eos = require('internal/streams/end-of-stream');
const internalBuffer = require('internal/buffer');
const promises = require('stream/promises');
const utils = require('internal/streams/utils');
const Stream = module.exports = require('internal/streams/legacy').Stream;
Stream.isDisturbed = require('internal/streams/utils').isDisturbed;
Stream.isDisturbed = utils.isDisturbed;
Stream.isErrored = utils.isErrored;
Stream.Readable = require('internal/streams/readable');
Stream.Writable = require('internal/streams/writable');
Stream.Duplex = require('internal/streams/duplex');
@@ -1,15 +1,18 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { isDisturbed, Readable } = require('stream');
const { isDisturbed, isErrored, Readable } = require('stream');
function noop() {}
function check(readable, data, fn) {
assert.strictEqual(readable.readableDidRead, false);
assert.strictEqual(isDisturbed(readable), false);
assert.strictEqual(isErrored(readable), false);
if (data === -1) {
readable.on('error', common.mustCall());
readable.on('error', common.mustCall(() => {
assert.strictEqual(isErrored(readable), true);
}));
readable.on('data', common.mustNotCall());
readable.on('end', common.mustNotCall());
} else {
+17 -1
View File
@@ -2,7 +2,7 @@
'use strict';
const common = require('../common');
const { isDisturbed } = require('stream');
const { isDisturbed, isErrored } = require('stream');
const assert = require('assert');
const {
isPromise,
@@ -1572,3 +1572,19 @@ class Source {
isDisturbed(stream, true);
})().then(common.mustCall());
}
{
const stream = new ReadableStream({
pull: common.mustCall((controller) => {
controller.error(new Error());
}),
});
const reader = stream.getReader();
(async () => {
isErrored(stream, false);
await reader.read().catch(common.mustCall());
isErrored(stream, true);
})().then(common.mustCall());
}
+4
View File
@@ -211,6 +211,10 @@ const customTypesMap = {
'stream.Readable': 'stream.html#class-streamreadable',
'stream.Transform': 'stream.html#class-streamtransform',
'stream.Writable': 'stream.html#class-streamwritable',
'Duplex': 'stream.html#class-streamduplex',
'Readable': 'stream.html#class-streamreadable',
'Transform': 'stream.html#class-streamtransform',
'Writable': 'stream.html#class-streamwritable',
'Immediate': 'timers.html#class-immediate',
'Timeout': 'timers.html#class-timeout',