Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[browser][http] mute JS exceptions about network errors + HEAD verb #113014

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

[browser][http] mute JS exceptions about network errors + HEAD verb #113014

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c21fa5f
testing
pavelsavara Feb 28, 2025
2366fb9
Merge branch 'main' into browser_http_mute_abort
pavelsavara Feb 28, 2025
023008d
Update src/mono/browser/runtime/http.ts
pavelsavara Feb 28, 2025
89c5fba
// in FF when the verb is HEAD, the body is null
pavelsavara Feb 28, 2025
d5ad489
Merge branch 'browser_http_mute_abort' of https://github.com/pavelsav…
pavelsavara Feb 28, 2025
b4daac9
feedback
pavelsavara Feb 28, 2025
4d18f0c
revert mistake
pavelsavara Feb 28, 2025
0b8c961
Merge branch 'main' into browser_http_mute_abort
lewing Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/mono/browser/runtime/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
import BuildConfiguration from "consts:configuration";

import { wrap_as_cancelable_promise } from "./cancelable-promise";
import { ENVIRONMENT_IS_NODE, Module, loaderHelpers, mono_assert } from "./globals";
import { ENVIRONMENT_IS_NODE, loaderHelpers, mono_assert } from "./globals";
import { assert_js_interop } from "./invoke-js";
import { MemoryViewType, Span } from "./marshal";
import type { VoidPtr } from "./types/emscripten";
import { ControllablePromise } from "./types/internal";
import { mono_log_debug } from "./logging";


function verifyEnvironment () {
Expand Down Expand Up @@ -72,12 +73,11 @@ export function http_wasm_create_controller (): HttpController {
return controller;
}

function handle_abort_error (promise:Promise<any>) {
function mute_unhandledrejection (promise:Promise<any>) {
promise.catch((err) => {
if (err && err !== "AbortError" && err.name !== "AbortError" ) {
Module.err("Unexpected error: " + err);
mono_log_debug("http muted" + err);
}
// otherwise, it's expected
});
}

Expand All @@ -86,15 +86,15 @@ export function http_wasm_abort (controller: HttpController): void {
try {
if (!controller.isAborted) {
if (controller.streamWriter) {
handle_abort_error(controller.streamWriter.abort());
mute_unhandledrejection(controller.streamWriter.abort());
controller.isAborted = true;
}
if (controller.streamReader) {
handle_abort_error(controller.streamReader.cancel());
mute_unhandledrejection(controller.streamReader.cancel());
controller.isAborted = true;
}
}
if (!controller.isAborted) {
if (!controller.isAborted && !controller.abortController.signal.aborted) {
controller.abortController.abort("AbortError");
}
} catch (err) {
Expand Down Expand Up @@ -138,8 +138,8 @@ export function http_wasm_fetch_stream (controller: HttpController, url: string,
if (BuildConfiguration === "Debug") commonAsserts(controller);
const transformStream = new TransformStream<Uint8Array, Uint8Array>();
controller.streamWriter = transformStream.writable.getWriter();
handle_abort_error(controller.streamWriter.closed);
handle_abort_error(controller.streamWriter.ready);
mute_unhandledrejection(controller.streamWriter.closed);
mute_unhandledrejection(controller.streamWriter.ready);
const fetch_promise = http_wasm_fetch(controller, url, header_names, header_values, option_names, option_values, transformStream.readable);
return fetch_promise;
}
Expand Down Expand Up @@ -182,6 +182,8 @@ export function http_wasm_fetch (controller: HttpController, url: string, header
// avoid processing headers if the fetch is canceled
controller.responsePromise.then((res: Response) => {
controller.response = res;
mono_assert(controller.response, "expected response");
mono_assert(controller.response.body, "expected response.body");
controller.responseHeaderNames = [];
controller.responseHeaderValues = [];
if (res.headers && (<any>res.headers).entries) {
Expand Down Expand Up @@ -250,9 +252,12 @@ export function http_wasm_get_streamed_response_bytes (controller: HttpControlle
// the bufferPtr is pinned by the caller
const view = new Span(bufferPtr, bufferLength, MemoryViewType.Byte);
return wrap_as_cancelable_promise(async () => {
await controller.responsePromise;
mono_assert(controller.response, "expected response");
mono_assert(controller.response.body, "expected response.body");
if (!controller.streamReader) {
controller.streamReader = controller.response.body!.getReader();
controller.streamReader = controller.response.body.getReader();
mute_unhandledrejection(controller.streamReader.closed);
}
if (!controller.currentStreamReaderChunk || controller.currentBufferOffset === undefined) {
controller.currentStreamReaderChunk = await controller.streamReader.read();
Expand Down
Loading