wip

Author: pavelsavara

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -79,7 +79,7 @@ else()
                 -sEXPORTED_RUNTIME_METHODS=ENV,${CMAKE_EMCC_EXPORTED_RUNTIME_METHODS}
                 -sEXPORTED_FUNCTIONS=_main,${CMAKE_EMCC_EXPORTED_FUNCTIONS}
                 -sEXPORT_NAME=createDotnetRuntime
-                -sENVIRONMENT=node,shell,web
+                -sENVIRONMENT=node,web
                 -Wl,-error-limit=0)
 
             if (CORERUN_IN_BROWSER)
@@ -95,7 +95,7 @@ else()
                 # If not running in the browser, add
                 # Node.js file system support.
                 target_link_options(corerun PRIVATE
-                    -lnoderawfs.js
+                    -sNODERAWFS=1
                     -lnodefs.js)
             endif()
         endif()

src/native/corehost/browserhost/CMakeLists.txt

@@ -116,7 +116,9 @@ target_link_options(browserhost PRIVATE
     -sEXPORTED_RUNTIME_METHODS=BROWSER_HOST,${CMAKE_EMCC_EXPORTED_RUNTIME_METHODS}
     -sEXPORTED_FUNCTIONS=_BrowserHost_InitializeCoreCLR,_BrowserHost_ExecuteAssembly,${CMAKE_EMCC_EXPORTED_FUNCTIONS}
     -sEXPORT_NAME=createDotnetRuntime
-    -lnodefs.js)
+    -sENVIRONMENT=web,webview,worker,node
+    -lnodefs.js
+    -Wl,-error-limit=0)
 
 target_link_libraries(browserhost PUBLIC
     BrowserHost-Static

src/native/corehost/browserhost/host/host.ts

@@ -6,7 +6,7 @@ import { } from "./cross-linked"; // ensure ambient symbols are declared
 
 const loadedAssemblies: Map<string, { ptr: number, length: number }> = new Map();
 
-export function registerDllBytes(bytes: Uint8Array, asset: { name: string }) {
+export function registerDllBytes(bytes: Uint8Array, asset: { name: string, virtualPath: string }) {
     const sp = Module.stackSave();
     try {
         const sizeOfPtr = 4;
@@ -18,6 +18,7 @@ export function registerDllBytes(bytes: Uint8Array, asset: { name: string }) {
         const ptr = Module.HEAPU32[ptrPtr as any >>> 2];
         Module.HEAPU8.set(bytes, ptr >>> 0);
         loadedAssemblies.set(asset.name, { ptr, length: bytes.length });
+        loadedAssemblies.set(asset.virtualPath, { ptr, length: bytes.length });
     } finally {
         Module.stackRestore(sp);
     }
@@ -40,6 +41,10 @@ export function installVfsFile(bytes: Uint8Array, asset: VfsAsset) {
         if (!parentDirectory.startsWith("/"))
             parentDirectory = "/" + parentDirectory;
 
+        if (parentDirectory.startsWith("/managed")) {
+            throw new Error("Cannot create files under /managed virtual directory as it is reserved for NodeFS mounting");
+        }
+
         dotnetLogger.debug(`Creating directory '${parentDirectory}'`);
 
         Module.FS_createPath(

src/native/corehost/browserhost/libBrowserHost.footer.js

@@ -19,7 +19,7 @@
         const exports = {};
         libBrowserHost(exports);
 
-        let commonDeps = ["$libBrowserHostFn", "$DOTNET", "$DOTNET_INTEROP", "$ENV"];
+        let commonDeps = ["$libBrowserHostFn", "$DOTNET", "$DOTNET_INTEROP", "$ENV", "$FS", "$NODEFS"];
         const lib = {
             $BROWSER_HOST: {
                 selfInitialize: () => {
@@ -54,6 +54,14 @@
 
                         // WASM-TODO: remove once globalization is loaded via ICU
                         ENV["DOTNET_SYSTEM_GLOBALIZATION_INVARIANT"] = "true";
+
+                        if (ENVIRONMENT_IS_NODE) {
+                            Module.preInit = [() => {
+                                FS.mkdir("/managed");
+                                FS.mount(NODEFS, { root: "." }, "/managed");
+                                FS.chdir("/managed");
+                            }];
+                        }
                     }
                 },
             },

src/native/corehost/browserhost/loader/bootstrap.ts

@@ -165,25 +165,33 @@ export async function findResources(dotnet: DotnetHostBuilder): Promise<void> {
         return;
     }
     const fs = await node_fs();
-    const url = await node_url();
-    const scriptDir = url.fileURLToPath(scriptDirectory).replace(windowsAbsoluteRx, "/").replace(/\\/g, "/");
-    const files: string[] = await fs.promises.readdir(scriptDir);
+    const mountedDir = "/managed";
+    const files: string[] = await fs.promises.readdir(".");
     const assemblies = files
         // TODO-WASM: webCIL
         .filter(file => file.endsWith(".dll"))
         .map(filename => {
             // filename without path
             const name = filename.substring(filename.lastIndexOf("/") + 1);
-            return { virtualPath: scriptDir + filename, name };
+            return { virtualPath: mountedDir + "/" + filename, name };
         });
+    const mainAssemblyName = globalThis.process.argv[2];
+    const runtimeConfigName = mainAssemblyName.replace(/\.dll$/, ".runtimeconfig.json");
+    let runtimeConfig = {};
+    if (fs.existsSync(runtimeConfigName)) {
+        const json = await fs.promises.readFile(runtimeConfigName, { encoding: "utf8" });
+        runtimeConfig = JSON.parse(json);
+    }
+
     const config: LoaderConfig = {
-        mainAssemblyName: globalThis.process.argv[2],
-        virtualWorkingDirectory: scriptDir,
+        mainAssemblyName,
+        runtimeConfig,
+        virtualWorkingDirectory: mountedDir,
         resources: {
             jsModuleNative: [{ name: "dotnet.native.js" }],
             jsModuleRuntime: [{ name: "dotnet.runtime.js" }],
             wasmNative: [{ name: "dotnet.native.wasm", }],
-            coreAssembly: [{ virtualPath: scriptDir + "System.Private.CoreLib.dll", name: "System.Private.CoreLib.dll" },],
+            coreAssembly: [{ virtualPath: mountedDir + "/System.Private.CoreLib.dll", name: "System.Private.CoreLib.dll" },],
             assembly: assemblies,
         }
     };