stream: minimize webstream abort hook behavior changes

Author: ikeyan

lib/internal/webstreams/readablestream.js

@@ -286,15 +286,8 @@ class ReadableStream {
   [kControllerAbortFunction](error) {
     if (!isReadableStream(this))
       throw new ERR_INVALID_THIS('ReadableStream');
-
-    const controller = this[kState].controller;
-    if (isReadableStreamDefaultController(controller)) {
-      readableStreamDefaultControllerError(controller, error);
-      return;
-    }
-
-    assert(isReadableByteStreamController(controller));
-    readableByteStreamControllerError(controller, error);
+    if (this[kState].state === 'readable')
+      setPromiseHandled(readableStreamCancel(this, error, 'errored'));
   }
 
   get [kIsDisturbed]() {
@@ -2090,22 +2083,26 @@ function isReadableStreamLocked(stream) {
   return stream[kState].reader !== undefined;
 }
 
-function readableStreamCancel(stream, reason) {
+function readableStreamCancel(stream, reason, finalState = 'closed') {
   stream[kState].disturbed = true;
   switch (stream[kState].state) {
     case 'closed':
       return PromiseResolve();
     case 'errored':
       return PromiseReject(stream[kState].storedError);
   }
-  readableStreamClose(stream);
-  const {
-    reader,
-  } = stream[kState];
-  if (reader !== undefined && readableStreamHasBYOBReader(stream)) {
-    for (let n = 0; n < reader[kState].readIntoRequests.length; n++)
-      reader[kState].readIntoRequests[n][kClose]();
-    reader[kState].readIntoRequests = [];
+  if (finalState === 'errored') {
+    readableStreamError(stream, reason);
+  } else {
+    readableStreamClose(stream);
+    const {
+      reader,
+    } = stream[kState];
+    if (reader !== undefined && readableStreamHasBYOBReader(stream)) {
+      for (let n = 0; n < reader[kState].readIntoRequests.length; n++)
+        reader[kState].readIntoRequests[n][kClose]();
+      reader[kState].readIntoRequests = [];
+    }
   }
 
   return PromisePrototypeThen(

lib/internal/webstreams/writablestream.js

@@ -187,7 +187,8 @@ class WritableStream {
   [kControllerAbortFunction](reason) {
     if (!isWritableStream(this))
       throw new ERR_INVALID_THIS('WritableStream');
-    setPromiseHandled(writableStreamAbort(this, reason));
+    if (this[kState].state === 'writable')
+      setPromiseHandled(writableStreamAbort(this, reason));
   }
 
   get [kIsErrored]() {