Bring back error handling for ReadableStream.getReader()

MattiasBuelens · Sep 30, 2023 · d89a21e · d89a21e
1 parent 7c6d4b7
commit d89a21e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/readable/byob_reader.rs b/src/readable/byob_reader.rs
@@ -28,10 +28,11 @@ impl<'stream> ReadableStreamBYOBReader<'stream> {
         Ok(Self {
             raw: stream
                 .as_raw()
-                .get_reader_with_options(
+                .unchecked_ref::<sys::ReadableStreamExt>()
+                .try_get_reader_with_options(
                     sys::ReadableStreamGetReaderOptions::new()
                         .mode(sys::ReadableStreamReaderMode::Byob),
-                )
+                )?
                 .unchecked_into(),
             _stream: PhantomData,
         })

diff --git a/src/readable/default_reader.rs b/src/readable/default_reader.rs
@@ -22,11 +22,12 @@ pub struct ReadableStreamDefaultReader<'stream> {
 
 impl<'stream> ReadableStreamDefaultReader<'stream> {
     pub(crate) fn new(stream: &mut ReadableStream) -> Result<Self, js_sys::Error> {
-        if stream.is_locked() {
-            return Err(js_sys::Error::new("Already locked"));
-        }
         Ok(Self {
-            raw: stream.as_raw().get_reader().unchecked_into(),
+            raw: stream
+                .as_raw()
+                .unchecked_ref::<sys::ReadableStreamExt>()
+                .try_get_reader()?
+                .unchecked_into(),
             _stream: PhantomData,
         })
     }

diff --git a/src/readable/sys.rs b/src/readable/sys.rs
@@ -1,7 +1,7 @@
 //! Raw bindings to JavaScript objects used
 //! by a [`ReadableStream`](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream).
 //! These are re-exported from [web-sys](https://docs.rs/web-sys/0.3.64/web_sys/struct.ReadableStream.html).
-use js_sys::Uint8Array;
+use js_sys::{Error, Object, Uint8Array};
 use wasm_bindgen::prelude::*;
 pub use web_sys::ReadableByteStreamController;
 // Re-export from web-sys
@@ -14,6 +14,21 @@ pub use web_sys::ReadableStreamGetReaderOptions;
 pub use web_sys::ReadableStreamReaderMode;
 pub use web_sys::StreamPipeOptions as PipeOptions;
 
+#[wasm_bindgen]
+extern "C" {
+    /// Additional methods for [`ReadableStream`](web_sys::ReadableStream).
+    pub(crate) type ReadableStreamExt;
+
+    #[wasm_bindgen(method, catch, js_name = getReader)]
+    pub(crate) fn try_get_reader(this: &ReadableStreamExt) -> Result<Object, Error>;
+
+    #[wasm_bindgen(method, catch, js_name = getReader)]
+    pub(crate) fn try_get_reader_with_options(
+        this: &ReadableStreamExt,
+        options: &ReadableStreamGetReaderOptions,
+    ) -> Result<Object, Error>;
+}
+
 #[wasm_bindgen]
 extern "C" {
     /// A result returned by [`ReadableStreamDefaultReader.read`](https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader/read).