From 29db4104c4b05d7eff3a5d74514db0904ea1cd98 Mon Sep 17 00:00:00 2001
From: Marcos Casagrande <marcoscvp90@gmail.com>
Date: Mon, 1 Jun 2020 14:37:46 +0200
Subject: fix(cli/web): Body.bodyUsed should use IsReadableStreamDisturbed

---
 cli/js/web/body.ts              | 3 ++-
 cli/js/web/streams/internals.ts | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'cli/js')

diff --git a/cli/js/web/body.ts b/cli/js/web/body.ts
index 7a5b63d32..672b7de5a 100644
--- a/cli/js/web/body.ts
+++ b/cli/js/web/body.ts
@@ -2,6 +2,7 @@ import * as blob from "./blob.ts";
 import * as encoding from "./text_encoding.ts";
 import * as domTypes from "./dom_types.d.ts";
 import { ReadableStreamImpl } from "./streams/readable_stream.ts";
+import { isReadableStreamDisturbed } from "./streams/internals.ts";
 import { getHeaderValueParams, hasHeaderValueOf } from "./util.ts";
 import { MultipartParser } from "./fetch/multipart.ts";
 
@@ -116,7 +117,7 @@ export class Body implements domTypes.Body {
   }
 
   get bodyUsed(): boolean {
-    if (this.body && this.body.locked) {
+    if (this.body && isReadableStreamDisturbed(this.body)) {
       return true;
     }
     return false;
diff --git a/cli/js/web/streams/internals.ts b/cli/js/web/streams/internals.ts
index ff8fc25fe..d0d35a1c3 100644
--- a/cli/js/web/streams/internals.ts
+++ b/cli/js/web/streams/internals.ts
@@ -367,6 +367,11 @@ export function isReadableStreamLocked(stream: ReadableStreamImpl): boolean {
   return stream[sym.reader] ? true : false;
 }
 
+export function isReadableStreamDisturbed(stream: ReadableStream): boolean {
+  assert(isReadableStream(stream));
+  return stream[sym.disturbed] ? true : false;
+}
+
 export function isTransformStream(
   x: unknown
 ): x is TransformStreamImpl<any, any> {
-- 
cgit v1.2.3