[browser] make dynamic import cancelable #80257
Conversation
pavelsavara
added
arch-wasm
| { | ||
| var cts = new CancellationTokenSource(); | ||
| cts.Cancel(); | ||
| var actualEx = await Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs", cts.Token)); |
There was a problem hiding this comment.
- Is there a way to reliably test that the operation gets cancelled in the middle? Passing an already cancelled token is a trivial case that is optimized in other asynchroonous functions. (and you can use
new CancellationToken(true)instead of creating a CTS) - Shouldn't it throw
OperationCancelledException?
There was a problem hiding this comment.
The underlying JS dynamic import() is not cancelable.
The JS promises are rather "abandoned" than really canceled. We only reject the JS promise.
(In general, we don't know what else registered continuation on that promise on JS side)
That creates JavaScript error, not managed error and we marshal it as JSException consistently with all other JS Errors.
fetch is bit better because it has AbortController.
There was a problem hiding this comment.
@pavelsavara Did you tried something like this?
var cts = new CancellationTokenSource();
var exTask = Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs", cts.Token));
cts.Cancel();
var actualEx = await exTask;There was a problem hiding this comment.
added to the unit test, it works fine
|
The CI failures of WBT seems to be unrelated. |
...ervices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportExportTest.cs
Show resolved
Hide resolved
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3858241533 |
|
@pavelsavara backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: make dynamic import cancelable
.git/rebase-apply/patch:26: trailing whitespace.
cts.Cancel();
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportExportTest.cs
M src/mono/wasm/runtime/invoke-js.ts
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/runtime/invoke-js.ts
CONFLICT (content): Merge conflict in src/mono/wasm/runtime/invoke-js.ts
Auto-merging src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportExportTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportExportTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 make dynamic import cancelable
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@pavelsavara an error occurred while backporting to release/7.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
Fixes #80028
We will need backport to Net7