From 9c79a0473e8f3c622be8548d11f331337288a0d6 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Thu, 9 Dec 2021 09:15:12 +0100
Subject: [PATCH] stream: add isErrored helper

Refs: https://github.com/nodejs/undici/pull/1134
---
 doc/api/stream.md                             | 13 +++++++++++++
 lib/internal/streams/utils.js                 | 19 ++++++++++++++++---
 lib/internal/webstreams/readablestream.js     |  4 ++++
 lib/stream.js                                 |  1 +
 test/parallel/test-stream-readable-didRead.js |  7 +++++--
 test/parallel/test-whatwg-readablestream.js   | 17 +++++++++++++++++
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/doc/api/stream.md b/doc/api/stream.md
index 8ca8fb1db5c0f1..5934ceae100e36 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -2225,6 +2225,19 @@ added: v16.8.0
 
 Returns whether the stream has been read from or cancelled.
 
+### `stream.Readable.isErrored(stream)`
+
+<!-- YAML
+added: v16.8.0
+-->
+
+> Stability: 1 - Experimental
+
+* `stream` {stream.Readable|ReadableStream}
+* Returns: `boolean`
+
+Returns whether the stream has been errored.
+
 ### `stream.Readable.toWeb(streamReadable)`
 
 <!-- YAML
diff --git a/lib/internal/streams/utils.js b/lib/internal/streams/utils.js
index 7838494b3153b1..ad5423849482ab 100644
--- a/lib/internal/streams/utils.js
+++ b/lib/internal/streams/utils.js
@@ -239,16 +239,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,
diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js
index c9b988d6fee0f7..43bc1a1081d512 100644
--- a/lib/internal/webstreams/readablestream.js
+++ b/lib/internal/webstreams/readablestream.js
@@ -241,6 +241,10 @@ class ReadableStream {
     return this[kState].disturbed;
   }
 
+  get [kIsErrored]() {
+    return this[kState].state === 'errored';
+  }
+
   /**
    * @readonly
    * @type {boolean}
diff --git a/lib/stream.js b/lib/stream.js
index cc56b76e31a4a6..ca6a90c4cf5916 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -39,6 +39,7 @@ const promises = require('stream/promises');
 
 const Stream = module.exports = require('internal/streams/legacy').Stream;
 Stream.isDisturbed = require('internal/streams/utils').isDisturbed;
+Stream.isErrored = require('internal/streams/utils').isErrored;
 Stream.Readable = require('internal/streams/readable');
 Stream.Writable = require('internal/streams/writable');
 Stream.Duplex = require('internal/streams/duplex');
diff --git a/test/parallel/test-stream-readable-didRead.js b/test/parallel/test-stream-readable-didRead.js
index c67289e65442c5..b84f16017d4fbf 100644
--- a/test/parallel/test-stream-readable-didRead.js
+++ b/test/parallel/test-stream-readable-didRead.js
@@ -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 {
diff --git a/test/parallel/test-whatwg-readablestream.js b/test/parallel/test-whatwg-readablestream.js
index ce1d892262be16..ed2e938bd43ab1 100644
--- a/test/parallel/test-whatwg-readablestream.js
+++ b/test/parallel/test-whatwg-readablestream.js
@@ -1572,3 +1572,20 @@ class Source {
     isDisturbed(stream, true);
   })().then(common.mustCall());
 }
+
+
+{
+  const stream = new ReadableStream({
+    start(controller) {
+      controller.error(new Error());
+    },
+    pull: common.mustNotCall(),
+  });
+
+  const reader = stream.getReader();
+  (async () => {
+    isErrored(stream, false);
+    await reader.read();
+    isErrored(stream, true);
+  })().then(common.mustCall());
+}