fix exports, fix early malloc

src/mono/wasm/runtime/exports.ts

@@ -34,7 +34,7 @@ import {
     mono_wasm_set_main_args,
     mono_wasm_pre_init,
     mono_wasm_runtime_is_initialized,
-    finalize_startup
+    mono_wasm_on_runtime_initialized
 } from "./startup";
 import { mono_set_timeout, schedule_background_exec } from "./scheduling";
 import { mono_wasm_load_icu_data, mono_wasm_get_icudt_name } from "./icu";
@@ -169,11 +169,6 @@ function initializeImportsAndExports(
     } else if (typeof module.preRun === "function") {
         module.preRun = [module.preRun];
     }
-    if (!module.postRun) {
-        module.postRun = [];
-    } else if (typeof module.postRun === "function") {
-        module.postRun = [module.postRun];
-    }
 
     if (!module.print) {
         module.print = console.log;
@@ -261,21 +256,17 @@ function initializeImportsAndExports(
 
     // if onRuntimeInitialized is set it's probably Blazor, we let them to do their own init sequence
     if (!module.onRuntimeInitialized) {
-        // this is registration of the runtime initialisation, it's async and uses fetch
-        module.preRun.push(async () => {
-            // execution order == [1] ==
-            module.addRunDependency("mono_load_runtime_and_bcl_args");
-            await mono_load_runtime_and_bcl_args(module.config);
-            module.removeRunDependency("mono_load_runtime_and_bcl_args");
-        });
-        // this is synchronous method, which needs that emscripten is already initialized
-        // execution order == [2] ==
-        module.onRuntimeInitialized = () => finalize_startup(module.config);
+        // note this would keep running in async-parallel with emscripten's `run()` and `postRun()` 
+        // because it's loading files asynchronously and the emscripten is not awaiting onRuntimeInitialized
+        // execution order == [1] ==
+        module.onRuntimeInitialized = () => mono_wasm_on_runtime_initialized();
 
         module.ready = module.ready.then(async () => {
             // mono_wasm_runtime_is_initialized is set when finalize_startup is done
             await mono_wasm_runtime_is_initialized;
-            // execution order == [3] ==
+            // TODO we could take over Module.postRun and call it from here if necessary
+
+            // execution order == [2] ==
             return exportedAPI;
         });
     }

src/mono/wasm/runtime/startup.ts

@@ -51,6 +51,15 @@ export async function mono_wasm_pre_init(): Promise<void> {
 
 }
 
+export async function mono_wasm_on_runtime_initialized(): Promise<void> {
+    if (!Module.config || Module.config.isError) {
+        return;
+    }
+    await mono_load_runtime_and_bcl_args(Module.config);
+    finalize_startup(Module.config);
+}
+
+
 // Set environment variable NAME to VALUE
 // Should be called before mono_load_runtime_and_bcl () in most cases
 export function mono_wasm_setenv(name: string, value: string): void {
@@ -154,7 +163,7 @@ function _apply_configuration_from_args(config: MonoConfig) {
         mono_wasm_init_coverage_profiler(config.coverage_profiler_options);
 }
 
-export function finalize_startup(config: MonoConfig | MonoConfigError | undefined): void {
+function finalize_startup(config: MonoConfig | MonoConfigError | undefined): void {
     try {
         if (!config || config.isError) {
             return;
@@ -319,7 +328,7 @@ export async function mono_load_runtime_and_bcl_args(config: MonoConfig | MonoCo
         }
 
         const load_asset = async (config: MonoConfig, asset: AllAssetEntryTypes): Promise<void> => {
-            Module.addRunDependency(asset.name);
+            // TODO Module.addRunDependency(asset.name);
 
             const sourcesList = asset.load_remote ? config.remote_sources! : [""];
             let error = undefined;
@@ -374,7 +383,7 @@ export async function mono_load_runtime_and_bcl_args(config: MonoConfig | MonoCo
                 if (!isOkToFail)
                     throw error;
             }
-            Module.removeRunDependency(asset.name);
+            // TODO Module.removeRunDependency(asset.name);
         };
         const fetch_promises: Promise<void>[] = [];
         // start fetching all assets in parallel

src/mono/wasm/wasm.proj

@@ -66,7 +66,7 @@
       <_EmccCommonFlags Include="-s ALLOW_MEMORY_GROWTH=1" />
       <_EmccCommonFlags Include="-s NO_EXIT_RUNTIME=1" />
       <_EmccCommonFlags Include="-s FORCE_FILESYSTEM=1" />
-      <_EmccCommonFlags Include="-s EXPORTED_RUNTIME_METHODS=&quot;['DOTNET','MONO','BINDING','INTERNAL','FS','print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency']&quot;" />
+      <_EmccCommonFlags Include="-s EXPORTED_RUNTIME_METHODS=&quot;['FS','print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency']&quot;" />
       <_EmccCommonFlags Include="-s EXPORTED_FUNCTIONS=&quot;['_free','_malloc']&quot;" />
       <_EmccCommonFlags Include="--source-map-base http://example.com" />