fix: errored stream is disturbed

lib/fetch/body.js

@@ -3,7 +3,7 @@
 const util = require('../core/util')
 const { ReadableStreamFrom, toUSVString, isBlobLike } = require('./util')
 const { FormData } = require('./formdata')
-const { kState, kError } = require('./symbols')
+const { kState } = require('./symbols')
 const { Blob } = require('buffer')
 const { kBodyUsed } = require('../core/symbols')
 const assert = require('assert')
@@ -187,6 +187,7 @@ function extractBody (object, keepalive = false) {
           // Whenever one or more bytes are available and stream is not errored,
           // enqueue a Uint8Array wrapping an ArrayBuffer containing the available
           // bytes into stream.
+          // TODO (perf): This check is slow,
           if (!/state: 'errored'/.test(nodeUtil.inspect(stream))) {
             controller.enqueue(new Uint8Array(value))
           }
@@ -268,10 +269,6 @@ const methods = {
     if (this[kState].body) {
       const stream = this[kState].body.stream
 
-      if (stream[kError]) {
-        throw stream[kError]
-      }
-
       if (util.isDisturbed(stream)) {
         throw new TypeError('disturbed')
       }

lib/fetch/index.js

@@ -31,7 +31,7 @@ const {
   determineRequestsReferrer,
   coarsenedSharedCurrentTime
 } = require('./util')
-const { kState, kHeaders, kGuard, kRealm, kError } = require('./symbols')
+const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const { AbortError } = require('../core/errors')
 const assert = require('assert')
 const { safelyExtractBody, cancelBody } = require('./body')
@@ -45,6 +45,7 @@ const {
 const { kHeadersList } = require('../core/symbols')
 const EE = require('events')
 const { PassThrough, pipeline, compose } = require('stream')
+const nodeUtil = require('util')
 
 let ReadableStream
 
@@ -1531,7 +1532,6 @@ function httpNetworkFetch (
           await pullAlgorithm(controller)
         },
         async cancel (reason) {
-          stream[kError] = reason
           await cancelAlgorithm(reason)
         }
       },
@@ -1742,8 +1742,9 @@ function httpNetworkFetch (
             controller.enqueue(new Uint8Array(bytes))
 
             // 8. If stream is errored, then terminate the ongoing fetch.
-            if (stream[kError]) {
-              this.context.terminate({ reason: stream[kError] })
+            // TODO (perf): This check is slow,
+            if (/state: 'errored'/.test(nodeUtil.inspect(stream))) {
+              this.context.terminate()
               return
             }
 

lib/fetch/symbols.js

@@ -6,6 +6,5 @@ module.exports = {
   kSignal: Symbol('signal'),
   kState: Symbol('state'),
   kGuard: Symbol('guard'),
-  kRealm: Symbol('realm'),
-  kError: Symbol('error')
+  kRealm: Symbol('realm')
 }

test/node-fetch/main.js

@@ -882,7 +882,7 @@ describe('node-fetch', () => {
           return expect(res.text())
             .to.eventually.be.rejected
             .and.be.an.instanceof(Error)
-            .and.have.property('name', 'AbortError')
+            .and.have.property('name', 'TypeError')
         })
     })
   })