lib: clean after the cancel algorithm throw error

MoonBall · sxa · commit 384872fdbdcf · 2022-03-07T17:38:13.000Z
PR-URL: #41366 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com>
diff --git a/lib/internal/webstreams/readablestream.js b/lib/internal/webstreams/readablestream.js
@@ -1911,9 +1911,12 @@ function readableStreamDefaultControllerError(controller, error) {
 
 function readableStreamDefaultControllerCancelSteps(controller, reason) {
 resetQueue(controller);
- const result = controller[kState].cancelAlgorithm(reason);
- readableStreamDefaultControllerClearAlgorithms(controller);
- return result;
+ try {
+ const result = controller[kState].cancelAlgorithm(reason);
+ return result;
+ } finally {
+ readableStreamDefaultControllerClearAlgorithms(controller);
+ }
 }
 
 function readableStreamDefaultControllerPullSteps(controller, readRequest) {
diff --git a/test/parallel/test-whatwg-readablestream.js b/test/parallel/test-whatwg-readablestream.js
@@ -80,6 +80,36 @@ const {
 assert(r.locked);
 }
 
+{
+ // Throw error and return rejected promise in `cancel()` method
+ // would execute same cleanup code
+ const r1 = new ReadableStream({
+ cancel: () => {
+ return Promise.reject('Cancel Error');
+ },
+ });
+ r1.cancel().finally(common.mustCall(() => {
+ const controllerState = r1[kState].controller[kState];
+
+ assert.strictEqual(controllerState.pullAlgorithm, undefined);
+ assert.strictEqual(controllerState.cancelAlgorithm, undefined);
+ assert.strictEqual(controllerState.sizeAlgorithm, undefined);
+ })).catch(() => {});
+
+ const r2 = new ReadableStream({
+ cancel() {
+ throw new Error('Cancel Error');
+ }
+ });
+ r2.cancel().finally(common.mustCall(() => {
+ const controllerState = r2[kState].controller[kState];
+
+ assert.strictEqual(controllerState.pullAlgorithm, undefined);
+ assert.strictEqual(controllerState.cancelAlgorithm, undefined);
+ assert.strictEqual(controllerState.sizeAlgorithm, undefined);
+ })).catch(() => {});
+}
+
 {
 const source = {
 start: common.mustCall((controller) => {

-Original file line number
+Diff line change
 functionreadableStreamDefaultControllerCancelSteps(controller,reason){
 resetQueue(controller);
 -constresult=controller[kState].cancelAlgorithm(reason);
 -readableStreamDefaultControllerClearAlgorithms(controller);
 -returnresult;
 +try{
 +constresult=controller[kState].cancelAlgorithm(reason);
 +returnresult;
 +}finally{
 +readableStreamDefaultControllerClearAlgorithms(controller);
 +}
+}
 functionreadableStreamDefaultControllerPullSteps(controller,readRequest){
-Original file line number
+Diff line change
 assert(r.locked);
+}
 +{
 +// Throw error and return rejected promise in `cancel()` method
 +// would execute same cleanup code
 +constr1=newReadableStream({
 +cancel: ()=>{
 +returnPromise.reject('Cancel Error');
 +},
 +});
 +r1.cancel().finally(common.mustCall(()=>{
 +constcontrollerState=r1[kState].controller[kState];
++
 +assert.strictEqual(controllerState.pullAlgorithm,undefined);
 +assert.strictEqual(controllerState.cancelAlgorithm,undefined);
 +assert.strictEqual(controllerState.sizeAlgorithm,undefined);
 +})).catch(()=>{});
++
 +constr2=newReadableStream({
 +cancel(){
 +thrownewError('Cancel Error');
 +}
 +});
 +r2.cancel().finally(common.mustCall(()=>{
 +constcontrollerState=r2[kState].controller[kState];
++
 +assert.strictEqual(controllerState.pullAlgorithm,undefined);
 +assert.strictEqual(controllerState.cancelAlgorithm,undefined);
 +assert.strictEqual(controllerState.sizeAlgorithm,undefined);
 +})).catch(()=>{});
 +}
++
+{
 constsource={
 start: common.mustCall((controller)=>{