LibWeb: Use WebIDL::invoke_promise_callback in Streams where appropriate

This avoids an issue where rejected JS::Promise types were converted to
a resolved WebIDL::Promise type.

Libraries/LibWeb/Streams/AbstractOperations.cpp

@@ -3141,29 +3141,28 @@ WebIDL::ExceptionOr<void> set_up_readable_stream_default_controller_from_underly
         return WebIDL::create_resolved_promise(realm, JS::js_undefined());
     });
 
-    // 5. If underlyingSourceDict["start"] exists, then set startAlgorithm to an algorithm which returns the result of invoking underlyingSourceDict["start"] with argument list « controller » and callback this value underlyingSource.
+    // 5. If underlyingSourceDict["start"] exists, then set startAlgorithm to an algorithm which returns the result of
+    //    invoking underlyingSourceDict["start"] with argument list « controller » and callback this value underlyingSource.
     if (underlying_source.start) {
         start_algorithm = GC::create_function(realm.heap(), [controller, underlying_source_value, callback = underlying_source.start]() -> WebIDL::ExceptionOr<JS::Value> {
-            // Note: callback does not return a promise, so invoke_callback may return an abrupt completion
             return TRY(WebIDL::invoke_callback(*callback, underlying_source_value, controller));
         });
     }
 
-    // 6. If underlyingSourceDict["pull"] exists, then set pullAlgorithm to an algorithm which returns the result of invoking underlyingSourceDict["pull"] with argument list « controller » and callback this value underlyingSource.
+    // 6. If underlyingSourceDict["pull"] exists, then set pullAlgorithm to an algorithm which returns the result of
+    //    invoking underlyingSourceDict["pull"] with argument list « controller » and callback this value underlyingSource.
     if (underlying_source.pull) {
-        pull_algorithm = GC::create_function(realm.heap(), [&realm, controller, underlying_source_value, callback = underlying_source.pull]() {
+        pull_algorithm = GC::create_function(realm.heap(), [controller, underlying_source_value, callback = underlying_source.pull]() {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_source_value, controller);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_source_value, controller));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
-    // 7. If underlyingSourceDict["cancel"] exists, then set cancelAlgorithm to an algorithm which takes an argument reason and returns the result of invoking underlyingSourceDict["cancel"] with argument list « reason » and callback this value underlyingSource.
+    // 7. If underlyingSourceDict["cancel"] exists, then set cancelAlgorithm to an algorithm which takes an argument
+    //    reason and returns the result of invoking underlyingSourceDict["cancel"] with argument list « reason » and
+    //    callback this value underlyingSource.
     if (underlying_source.cancel) {
-        cancel_algorithm = GC::create_function(realm.heap(), [&realm, underlying_source_value, callback = underlying_source.cancel](JS::Value reason) {
+        cancel_algorithm = GC::create_function(realm.heap(), [underlying_source_value, callback = underlying_source.cancel](JS::Value reason) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_source_value, reason);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_source_value, reason));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
@@ -4847,7 +4846,6 @@ WebIDL::ExceptionOr<void> set_up_writable_stream_default_controller_from_underly
     //    callback this value underlyingSink.
     if (underlying_sink.start) {
         start_algorithm = GC::create_function(realm.heap(), [controller, underlying_sink_value, callback = underlying_sink.start]() -> WebIDL::ExceptionOr<JS::Value> {
-            // Note: callback does not return a promise, so invoke_callback may return an abrupt completion
             return TRY(WebIDL::invoke_callback(*callback, underlying_sink_value, WebIDL::ExceptionBehavior::Rethrow, controller));
         });
     }
@@ -4856,20 +4854,16 @@ WebIDL::ExceptionOr<void> set_up_writable_stream_default_controller_from_underly
     //    and returns the result of invoking underlyingSinkDict["write"] with argument list « chunk, controller » and
     //    callback this value underlyingSink.
     if (underlying_sink.write) {
-        write_algorithm = GC::create_function(realm.heap(), [&realm, controller, underlying_sink_value, callback = underlying_sink.write](JS::Value chunk) {
+        write_algorithm = GC::create_function(realm.heap(), [controller, underlying_sink_value, callback = underlying_sink.write](JS::Value chunk) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_sink_value, chunk, controller);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_sink_value, chunk, controller));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
     // 8. If underlyingSinkDict["close"] exists, then set closeAlgorithm to an algorithm which returns the result of
     //    invoking underlyingSinkDict["close"] with argument list «» and callback this value underlyingSink.
     if (underlying_sink.close) {
-        close_algorithm = GC::create_function(realm.heap(), [&realm, underlying_sink_value, callback = underlying_sink.close]() {
+        close_algorithm = GC::create_function(realm.heap(), [underlying_sink_value, callback = underlying_sink.close]() {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_sink_value);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_sink_value));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
@@ -4877,10 +4871,8 @@ WebIDL::ExceptionOr<void> set_up_writable_stream_default_controller_from_underly
     //    and returns the result of invoking underlyingSinkDict["abort"] with argument list « reason » and callback this
     //    value underlyingSink.
     if (underlying_sink.abort) {
-        abort_algorithm = GC::create_function(realm.heap(), [&realm, underlying_sink_value, callback = underlying_sink.abort](JS::Value reason) {
+        abort_algorithm = GC::create_function(realm.heap(), [underlying_sink_value, callback = underlying_sink.abort](JS::Value reason) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_sink_value, reason);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_sink_value, reason));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
@@ -5282,30 +5274,24 @@ void set_up_transform_stream_default_controller_from_transformer(TransformStream
     //    and returns the result of invoking transformerDict["transform"] with argument list « chunk, controller » and
     //    callback this value transformer.
     if (transformer_dict.transform) {
-        transform_algorithm = GC::create_function(realm.heap(), [controller, &realm, transformer, callback = transformer_dict.transform](JS::Value chunk) {
+        transform_algorithm = GC::create_function(realm.heap(), [controller, transformer, callback = transformer_dict.transform](JS::Value chunk) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, transformer, chunk, controller);
-            auto result = MUST(WebIDL::invoke_callback(*callback, transformer, chunk, controller));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
     // 6. If transformerDict["flush"] exists, set flushAlgorithm to an algorithm which returns the result of invoking
     //    transformerDict["flush"] with argument list « controller » and callback this value transformer.
     if (transformer_dict.flush) {
-        flush_algorithm = GC::create_function(realm.heap(), [&realm, transformer, callback = transformer_dict.flush, controller]() {
+        flush_algorithm = GC::create_function(realm.heap(), [transformer, callback = transformer_dict.flush, controller]() {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, transformer, controller);
-            auto result = MUST(WebIDL::invoke_callback(*callback, transformer, controller));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
     // 7. If transformerDict["cancel"] exists, set cancelAlgorithm to an algorithm which takes an argument reason and returns
     // the result of invoking transformerDict["cancel"] with argument list « reason » and callback this value transformer.
     if (transformer_dict.cancel) {
-        cancel_algorithm = GC::create_function(realm.heap(), [&realm, transformer, callback = transformer_dict.cancel](JS::Value reason) {
+        cancel_algorithm = GC::create_function(realm.heap(), [transformer, callback = transformer_dict.cancel](JS::Value reason) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, transformer, reason);
-            auto result = MUST(WebIDL::invoke_callback(*callback, transformer, reason));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
@@ -5826,29 +5812,28 @@ WebIDL::ExceptionOr<void> set_up_readable_byte_stream_controller_from_underlying
         return WebIDL::create_resolved_promise(realm, JS::js_undefined());
     });
 
-    // 5. If underlyingSourceDict["start"] exists, then set startAlgorithm to an algorithm which returns the result of invoking underlyingSourceDict["start"] with argument list « controller » and callback this value underlyingSource.
+    // 5. If underlyingSourceDict["start"] exists, then set startAlgorithm to an algorithm which returns the result of
+    //    invoking underlyingSourceDict["start"] with argument list « controller » and callback this value underlyingSource.
     if (underlying_source_dict.start) {
         start_algorithm = GC::create_function(realm.heap(), [controller, underlying_source, callback = underlying_source_dict.start]() -> WebIDL::ExceptionOr<JS::Value> {
-            // Note: callback does not return a promise, so invoke_callback may return an abrupt completion
             return TRY(WebIDL::invoke_callback(*callback, underlying_source, controller));
         });
     }
 
-    // 6. If underlyingSourceDict["pull"] exists, then set pullAlgorithm to an algorithm which returns the result of invoking underlyingSourceDict["pull"] with argument list « controller » and callback this value underlyingSource.
+    // 6. If underlyingSourceDict["pull"] exists, then set pullAlgorithm to an algorithm which returns the result of
+    //    invoking underlyingSourceDict["pull"] with argument list « controller » and callback this value underlyingSource.
     if (underlying_source_dict.pull) {
-        pull_algorithm = GC::create_function(realm.heap(), [&realm, controller, underlying_source, callback = underlying_source_dict.pull]() {
+        pull_algorithm = GC::create_function(realm.heap(), [controller, underlying_source, callback = underlying_source_dict.pull]() {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_source, controller);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_source, controller));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 
-    // 7. If underlyingSourceDict["cancel"] exists, then set cancelAlgorithm to an algorithm which takes an argument reason and returns the result of invoking underlyingSourceDict["cancel"] with argument list « reason » and callback this value underlyingSource.
+    // 7. If underlyingSourceDict["cancel"] exists, then set cancelAlgorithm to an algorithm which takes an argument
+    //    reason and returns the result of invoking underlyingSourceDict["cancel"] with argument list « reason » and
+    //    callback this value underlyingSource.
     if (underlying_source_dict.cancel) {
-        cancel_algorithm = GC::create_function(realm.heap(), [&realm, underlying_source, callback = underlying_source_dict.cancel](JS::Value reason) {
+        cancel_algorithm = GC::create_function(realm.heap(), [underlying_source, callback = underlying_source_dict.cancel](JS::Value reason) {
-            // Note: callback returns a promise, so invoke_callback will never return an abrupt completion
+            return WebIDL::invoke_promise_callback(*callback, underlying_source, reason);
-            auto result = MUST(WebIDL::invoke_callback(*callback, underlying_source, reason));
-            return WebIDL::create_resolved_promise(realm, result);
         });
     }
 

Tests/LibWeb/Text/expected/wpt-import/streams/readable-streams/tee.any.txt

@@ -2,12 +2,11 @@ Harness status: OK
 
 Found 26 tests
 
-25 Pass
+26 Pass
-1 Fail
 Pass	ReadableStream teeing: rs.tee() returns an array of two ReadableStreams
 Pass	ReadableStream teeing: should be able to read one branch to the end without affecting the other
 Pass	ReadableStream teeing: values should be equal across each branch
-Fail	ReadableStream teeing: errors in the source should propagate to both branches
+Pass	ReadableStream teeing: errors in the source should propagate to both branches
 Pass	ReadableStream teeing: canceling branch1 should not impact branch2
 Pass	ReadableStream teeing: canceling branch2 should not impact branch1
 Pass	Running templatedRSTeeCancel with ReadableStream teeing