wip

Author: pavelsavara

src/libraries/Common/src/Interop/Browser/Interop.Runtime.CoreCLR.cs

@@ -0,0 +1,42 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class Runtime
+    {
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "SystemInteropJS_BindJSImportST")]
+        public static extern unsafe nint BindJSImportST(void* signature);
+
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "SystemInteropJS_InvokeJSImportST")]
+        public static extern void InvokeJSImportST(int importHandle, nint args);
+
+        /* TODO-WASM
+        [LibraryImport(RuntimeHelpers.QCall)]
+        internal static extern void ReleaseCSOwnedObject(nint jsHandle);
+
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void InvokeJSFunction(nint functionHandle, nint data);
+
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void ResolveOrRejectPromise(nint data);
+
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern nint RegisterGCRoot(void* start, int bytesSize, IntPtr name);
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void DeregisterGCRoot(nint handle);
+
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void CancelPromise(nint gcHandle);
+
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void BindAssemblyExports(IntPtr assemblyNamePtr);
+        [LibraryImport(RuntimeHelpers.QCall)]
+        public static extern void GetAssemblyExport(IntPtr assemblyNamePtr, IntPtr namespacePtr, IntPtr classnamePtr, IntPtr methodNamePtr, int signatureHash, IntPtr* monoMethodPtrPtr);
+        */
+    }
+}

src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs renamed to src/libraries/Common/src/Interop/Browser/Interop.Runtime.Mono.cs

@@ -23,7 +23,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'browser'">
-    <Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.cs" Link="System\Runtime\InteropServices\JavaScript\Interop\Interop.Runtime.cs" />
+    <Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.Mono.cs" Link="System\Runtime\InteropServices\JavaScript\Interop\Interop.Runtime.Mono.cs" Condition="'$(RuntimeFlavor)' == 'Mono'" />
+    <Compile Include="$(CommonPath)Interop\Browser\Interop.Runtime.CoreCLR.cs" Link="System\Runtime\InteropServices\JavaScript\Interop\Interop.Runtime.CoreCLR.cs" Condition="'$(RuntimeFlavor)' == 'CoreCLR'" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\Interop\JavaScriptImports.Generated.cs" />
     <Compile Include="System\Runtime\InteropServices\JavaScript\Interop\JavaScriptExports.cs" />
 

src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj

@@ -31,24 +31,24 @@ let _next_gcv_handle = -2;
 // GCVHandle is like GCHandle, but it's not tracked and allocated by the mono GC, but just by JS.
 // It's used when we need to create GCHandle-like identity ahead of time, before calling Mono.
 // they have negative values, so that they don't collide with GCHandles.
-export function alloc_gcv_handle (): GCHandle {
+export function alloc_gcv_handle(): GCHandle {
     const gcv_handle = _gcv_handle_free_list.length ? _gcv_handle_free_list.pop() : _next_gcv_handle--;
     return gcv_handle as any;
 }
 
-export function free_gcv_handle (gcv_handle: GCHandle): void {
+export function free_gcv_handle(gcv_handle: GCHandle): void {
     _gcv_handle_free_list.push(gcv_handle);
 }
 
-export function is_jsv_handle (js_handle: JSHandle): boolean {
+export function is_jsv_handle(js_handle: JSHandle): boolean {
     return (js_handle as any) < -1;
 }
 
-export function is_js_handle (js_handle: JSHandle): boolean {
+export function is_js_handle(js_handle: JSHandle): boolean {
     return (js_handle as any) > 0;
 }
 
-export function is_gcv_handle (gc_handle: GCHandle): boolean {
+export function is_gcv_handle(gc_handle: GCHandle): boolean {
     return (gc_handle as any) < -1;
 }
 
@@ -62,15 +62,15 @@ export const cs_owned_js_handle_symbol = Symbol.for("wasm cs_owned_js_handle");
 export const do_not_force_dispose = Symbol.for("wasm do_not_force_dispose");
 
 
-export function mono_wasm_get_jsobj_from_js_handle (js_handle: JSHandle): any {
+export function mono_wasm_get_jsobj_from_js_handle(js_handle: JSHandle): any {
     if (is_js_handle(js_handle))
         return _cs_owned_objects_by_js_handle[<any>js_handle];
     if (is_jsv_handle(js_handle))
         return _cs_owned_objects_by_jsv_handle[0 - <any>js_handle];
     return null;
 }
 
-export function mono_wasm_get_js_handle (js_obj: any): JSHandle {
+export function mono_wasm_get_js_handle(js_obj: any): JSHandle {
     assert_js_interop();
     if (js_obj[cs_owned_js_handle_symbol]) {
         return js_obj[cs_owned_js_handle_symbol];
@@ -94,7 +94,7 @@ export function mono_wasm_get_js_handle (js_obj: any): JSHandle {
     return js_handle as JSHandle;
 }
 
-export function register_with_jsv_handle (js_obj: any, jsv_handle: JSHandle) {
+export function register_with_jsv_handle(js_obj: any, jsv_handle: JSHandle) {
     assert_js_interop();
     // note _cs_owned_objects_by_js_handle is list, not Map. That's why we maintain _js_handle_free_list.
     _cs_owned_objects_by_jsv_handle[0 - <any>jsv_handle] = js_obj;
@@ -105,7 +105,7 @@ export function register_with_jsv_handle (js_obj: any, jsv_handle: JSHandle) {
 }
 
 // note: in MT, this is called from locked JSProxyContext. Don't call anything that would need locking.
-export function SystemInteropJS_ReleaseCSOwnedObject (js_handle: JSHandle): void {
+export function SystemInteropJS_ReleaseCSOwnedObject(js_handle: JSHandle): void {
     let obj: any;
     if (is_js_handle(js_handle)) {
         obj = _cs_owned_objects_by_js_handle[<any>js_handle];
@@ -122,7 +122,7 @@ export function SystemInteropJS_ReleaseCSOwnedObject (js_handle: JSHandle): void
     }
 }
 
-export function setup_managed_proxy (owner: any, gc_handle: GCHandle): void {
+export function setup_managed_proxy(owner: any, gc_handle: GCHandle): void {
     assert_js_interop();
     // keep the gc_handle so that we could easily convert it back to original C# object for roundtrip
     owner[js_owned_gc_handle_symbol] = gc_handle;
@@ -139,15 +139,15 @@ export function setup_managed_proxy (owner: any, gc_handle: GCHandle): void {
     _js_owned_object_table.set(gc_handle, wr);
 }
 
-export function upgrade_managed_proxy_to_strong_ref (owner: any, gc_handle: GCHandle): void {
+export function upgrade_managed_proxy_to_strong_ref(owner: any, gc_handle: GCHandle): void {
     const sr = create_strong_ref(owner);
     if (_use_finalization_registry) {
         _js_owned_object_registry.unregister(owner);
     }
     _js_owned_object_table.set(gc_handle, sr);
 }
 
-export function teardown_managed_proxy (owner: any, gc_handle: GCHandle, skipManaged?: boolean): void {
+export function teardown_managed_proxy(owner: any, gc_handle: GCHandle, skipManaged?: boolean): void {
     assert_js_interop();
     // The JS object associated with this gc_handle has been collected by the JS GC.
     // As such, it's not possible for this gc_handle to be invoked by JS anymore, so
@@ -171,21 +171,21 @@ export function teardown_managed_proxy (owner: any, gc_handle: GCHandle, skipMan
     }
 }
 
-export function assert_not_disposed (result: any): GCHandle {
+export function assert_not_disposed(result: any): GCHandle {
     const gc_handle = result[js_owned_gc_handle_symbol];
     mono_check(gc_handle != GCHandleNull, "ObjectDisposedException");
     return gc_handle;
 }
 
-function _js_owned_object_finalized (gc_handle: GCHandle): void {
+function _js_owned_object_finalized(gc_handle: GCHandle): void {
     if (!loaderHelpers.is_runtime_running()) {
         // We're shutting down, so don't bother doing anything else.
         return;
     }
     teardown_managed_proxy(null, gc_handle);
 }
 
-export function _lookup_js_owned_object (gc_handle: GCHandle): any {
+export function _lookup_js_owned_object(gc_handle: GCHandle): any {
     if (!gc_handle)
         return null;
     const wr = _js_owned_object_table.get(gc_handle);
@@ -197,7 +197,7 @@ export function _lookup_js_owned_object (gc_handle: GCHandle): any {
     return null;
 }
 
-export function assertNoProxies (): void {
+export function assertNoProxies(): void {
     if (!WasmEnableThreads) return;
     mono_assert(_js_owned_object_table.size === 0, "There should be no proxies on this thread.");
     mono_assert(_cs_owned_objects_by_js_handle.length === 1, "There should be no proxies on this thread.");
@@ -210,7 +210,7 @@ let force_dispose_proxies_in_progress = false;
 
 // when we arrive here from UninstallWebWorkerInterop, the C# will unregister the handles too.
 // when called from elsewhere, C# side could be unbalanced!!
-export function forceDisposeProxies (disposeMethods: boolean, verbose: boolean): void {
+export function forceDisposeProxies(disposeMethods: boolean, verbose: boolean): void {
     let keepSomeCsAlive = false;
     let keepSomeJsAlive = false;
     force_dispose_proxies_in_progress = true;

src/mono/browser/runtime/gc-handles.ts

@@ -7,7 +7,7 @@ import { dotnetAssert, dotnetGetInternals, dotnetBrowserHostExports, dotnetUpdat
 import { ENVIRONMENT_IS_NODE, ENVIRONMENT_IS_SHELL } from "./per-module";
 import { getLoaderConfig } from "./config";
 import { BrowserHost_InitializeCoreCLR } from "./run";
-import { createPromiseController } from "./promise-controller";
+import { createPromiseCompletionSource } from "./promise-completion-source";
 import { node_fs, node_url } from "./polyfills";
 
 const scriptUrlQuery = /*! webpackIgnore: true */import.meta.url;
@@ -16,7 +16,7 @@ const modulesUniqueQuery = queryIndex > 0 ? scriptUrlQuery.substring(queryIndex)
 const scriptUrl = normalizeFileUrl(scriptUrlQuery);
 const scriptDirectory = normalizeDirectoryUrl(scriptUrl);
 
-const nativeModulePromiseController = createPromiseController<EmscriptenModuleInternal>(() => {
+const nativeModulePromiseController = createPromiseCompletionSource<EmscriptenModuleInternal>(() => {
     dotnetUpdateInternals(dotnetGetInternals());
 });
 

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

@@ -18,6 +18,7 @@ import { check, error, info, warn, debug } from "./logging";
 
 import { dotnetAssert, dotnetLoaderExports, dotnetLogger, dotnetUpdateInternals, dotnetUpdateInternalsSubscriber } from "./cross-module";
 import { rejectRunMainPromise, resolveRunMainPromise, getRunMainPromise } from "./run";
+import { createPromiseCompletionSource } from "./promise-completion-source";
 
 export function dotnetInitializeModule(): RuntimeAPI {
 
@@ -53,6 +54,7 @@ export function dotnetInitializeModule(): RuntimeAPI {
         getRunMainPromise,
         rejectRunMainPromise,
         resolveRunMainPromise,
+        createPromiseCompletionSource,
     };
     Object.assign(dotnetLoaderExports, loaderFunctions);
     const logger: LoggerType = {
@@ -82,6 +84,7 @@ export function dotnetInitializeModule(): RuntimeAPI {
             dotnetLoaderExports.resolveRunMainPromise,
             dotnetLoaderExports.rejectRunMainPromise,
             dotnetLoaderExports.getRunMainPromise,
+            dotnetLoaderExports.createPromiseCompletionSource,
         ];
     }
 }

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

@@ -14,12 +14,15 @@ export function check(condition: unknown, messageFactory: string | (() => string
 
 const prefix = "DOTNET: ";
 
-export function info(msg: string, ...data: any) {
-    console.info(prefix + msg, ...data);
+export function debug(msg: string | (() => string), ...data: any) {
+    if (typeof msg === "function") {
+        msg = msg();
+    }
+    console.debug(prefix + msg, ...data);
 }
 
-export function debug(msg: string, ...data: any) {
-    console.debug(prefix + msg, ...data);
+export function info(msg: string, ...data: any) {
+    console.info(prefix + msg, ...data);
 }
 
 export function warn(msg: string, ...data: any) {

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

@@ -1,17 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import type { ControllablePromise, PromiseController } from "./types";
+import type { ControllablePromise, PromiseCompletionSource } from "./types";
 
 /// a unique symbol used to mark a promise as controllable
-export const promiseControlSymbol = Symbol.for("wasm promise control");
-
-// WASM-TODO: PromiseCompletionSource
+export const promiseCompletionSourceSymbol = Symbol.for("wasm promise control");
 
 /// Creates a new promise together with a controller that can be used to resolve or reject that promise.
 /// Optionally takes callbacks to be called immediately after a promise is resolved or rejected.
-export function createPromiseController<T>(afterResolve?: () => void, afterReject?: () => void): PromiseController<T> {
-    let promiseControl: PromiseController<T> = null as unknown as PromiseController<T>;
+export function createPromiseCompletionSource<T>(afterResolve?: () => void, afterReject?: () => void): PromiseCompletionSource<T> {
+    let promiseControl: PromiseCompletionSource<T> = null as unknown as PromiseCompletionSource<T>;
     const promise = new Promise<T>((resolve, reject) => {
         promiseControl = {
             isDone: false,
@@ -41,16 +39,16 @@ export function createPromiseController<T>(afterResolve?: () => void, afterRejec
     });
     (<any>promiseControl).promise = promise;
     const controllablePromise = promise as ControllablePromise<T>;
-    (controllablePromise as any)[promiseControlSymbol] = promiseControl;
+    (controllablePromise as any)[promiseCompletionSourceSymbol] = promiseControl;
     return promiseControl;
 }
 
-export function getPromiseController<T>(promise: ControllablePromise<T>): PromiseController<T>;
-export function getPromiseController<T>(promise: Promise<T>): PromiseController<T> | undefined {
-    return (promise as any)[promiseControlSymbol];
+export function getPromiseCompletionSource<T>(promise: ControllablePromise<T>): PromiseCompletionSource<T>;
+export function getPromiseCompletionSource<T>(promise: Promise<T>): PromiseCompletionSource<T> | undefined {
+    return (promise as any)[promiseCompletionSourceSymbol];
 }
 
 export function isControllablePromise<T>(promise: Promise<T>): promise is ControllablePromise<T> {
-    return (promise as any)[promiseControlSymbol] !== undefined;
+    return (promise as any)[promiseCompletionSourceSymbol] !== undefined;
 }
 

src/native/corehost/browserhost/loader/promise-controller.ts renamed to src/native/corehost/browserhost/loader/promise-completion-source.ts

@@ -5,10 +5,10 @@ import { DotnetHostBuilder } from "../types";
 import { findResources, isNodeHosted, isShellHosted } from "./bootstrap";
 import { Module, dotnetAssert } from "./cross-module";
 import { exit } from "./exit";
-import { createPromiseController } from "./promise-controller";
+import { createPromiseCompletionSource } from "./promise-completion-source";
 
 let CoreCLRInitialized = false;
-const runMainPromiseController = createPromiseController<number>();
+const runMainPromiseController = createPromiseCompletionSource<number>();
 
 export function BrowserHost_InitializeCoreCLR(): void {
     dotnetAssert.check(!CoreCLRInitialized, "CoreCLR should be initialized just once");

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

@@ -23,16 +23,16 @@ set(ROLLUP_TS_SOURCES
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/bootstrap.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/config.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/cross-module.ts"
-    "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/dotnet.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/dotnet.d.ts"
+    "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/dotnet.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/exit.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/host-builder.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/index.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/lib-initializers.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/logging.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/per-module.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/polyfills.ts"
-    "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/promise-controller.ts"
+    "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/promise-completion-source.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/run.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/loader/types.ts"
     "${CLR_SRC_NATIVE_DIR}/corehost/browserhost/types.ts"
@@ -54,9 +54,9 @@ set(ROLLUP_TS_SOURCES
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/crypto.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/globalization-locale.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/index.ts"
-    "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/timer.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/main.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/per-module.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/native/timer.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/types.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/utils/cdac.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/utils/cross-module.ts"
@@ -70,9 +70,17 @@ set(ROLLUP_TS_SOURCES
     "${CLR_SRC_NATIVE_DIR}/libs/System.Native.Browser/utils/types.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/dotnet.runtime.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/cross-module.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/gc-handles.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/index.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/invoke-cs.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/invoke-js.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/marshal-to-cs.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/marshal-to-js.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/marshal.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/per-module.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/types.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/utils.ts"
+    "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/interop/weak-ref.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/native/cross-linked.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/native/index.ts"
     "${CLR_SRC_NATIVE_DIR}/libs/System.Runtime.InteropServices.JavaScript.Native/types.ts"