diff --git a/src/mono/browser/runtime/loader/run.ts b/src/mono/browser/runtime/loader/run.ts index 2a9173bc3dcb43..6afe902c868c59 100644 --- a/src/mono/browser/runtime/loader/run.ts +++ b/src/mono/browser/runtime/loader/run.ts @@ -486,7 +486,7 @@ async function initializeModules (es6Modules: [RuntimeModuleExportsInternal, Nat await configureRuntimeStartup(emscriptenModule); loaderHelpers.runtimeModuleLoaded.promise_control.resolve(); - emscriptenFactory((originalModule: EmscriptenModuleInternal) => { + const result = emscriptenFactory((originalModule: EmscriptenModuleInternal) => { Object.assign(emscriptenModule, { ready: originalModule.ready, __dotnet_runtime: { @@ -496,6 +496,12 @@ async function initializeModules (es6Modules: [RuntimeModuleExportsInternal, Nat return emscriptenModule; }); + result.catch((error) => { + if (error.message && error.message.toLowerCase().includes("out of memory")) { + throw new Error(".NET runtime has failed to start, because too much memory was requested. Please decrease the memory by adjusting EmccMaximumHeapSize. See also https://aka.ms/dotnet-wasm-features"); + } + throw error; + }); } async function downloadOnly ():Promise { diff --git a/src/mono/browser/runtime/types/internal.ts b/src/mono/browser/runtime/types/internal.ts index 0180dc3959cab4..0627543d1fb12f 100644 --- a/src/mono/browser/runtime/types/internal.ts +++ b/src/mono/browser/runtime/types/internal.ts @@ -507,7 +507,7 @@ export type RuntimeModuleExportsInternal = { } export type NativeModuleExportsInternal = { - default: (unificator: Function) => EmscriptenModuleInternal + default: (unificator: Function) => Promise } export type HybridGlobalizationModuleExportsInternal = { diff --git a/src/mono/wasm/features.md b/src/mono/wasm/features.md index 627c87dfd76aa7..fdb3be6117b184 100644 --- a/src/mono/wasm/features.md +++ b/src/mono/wasm/features.md @@ -71,7 +71,7 @@ WebSocket support in NodeJS hosts requires the `ws` npm package. ### Initial Memory Size By default the .NET runtime will reserve a small amount of memory at startup, and as your application allocates more objects the runtime will attempt to "grow" this memory. This growth operation takes time and could fail if your device's memory is limited, which would result in an application error or "tab crash". -To reduce startup time and increase the odds that your application will work on devices with limited memory, you can set an initial size for the memory allocation, based on an estimate of how much memory your application typically uses. To set an initial memory size, include an MSBuild property like `16777216`, where you have changed the number of bytes to an appropriate value for your application. This value must be a multiple of 16384. +To reduce startup time and increase the odds that your application will work on devices with limited memory, you can set an initial size for the memory allocation, based on an estimate of how much memory your application typically uses. To set an initial memory size, include an MSBuild property like `16777216`, where you have changed the number of bytes to an appropriate value for your application. This value must be a multiple of 16384. The default value is `2,147,483,648 bytes`, which may be too large and result in the app failing to start, because the browser refuses to grant it. This property requires the [wasm-tools workload](#wasm-tools-workload) to be installed.