huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use mono wasm method to invoke entry point (#17050)

This commit is contained in:
Pranav K 2019-11-18 14:54:27 -08:00 committed by GitHub
parent 6af7fbe30e
commit ff4791ea90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Web.JS/dist/Release/blazor.webassembly.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
src/Components/Web.JS/src/Boot.WebAssembly.ts
View File

@ -61,7 +61,7 @@ async function boot(options?: any): Promise<void> {
// Start up the application
const mainAssemblyName = getAssemblyNameFromUrl(bootConfig.main);
platform.callEntryPoint(mainAssemblyName, bootConfig.entryPoint, []);
platform.callEntryPoint(mainAssemblyName);
}
async function fetchBootConfigAsync() {

20
src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
View File

@ -11,6 +11,7 @@ let assembly_load: (assemblyName: string) => number;
let find_class: (assemblyHandle: number, namespace: string, className: string) => number;
let find_method: (typeHandle: number, methodName: string, unknownArg: number) => MethodHandle;
let invoke_method: (method: MethodHandle, target: System_Object, argsArrayPtr: number, exceptionFlagIntPtr: number) => System_Object;
let mono_call_assembly_entry_point: (assemblyName: string, args: System_Object[]) => System_Object;
let mono_string_get_utf8: (managedString: System_String) => Mono.Utf8Ptr;
let mono_string: (jsString: string) => System_String;
const appBinDirName = 'appBinDir';
@ -39,21 +40,8 @@ export const monoPlatform: Platform = {
findMethod: findMethod,
callEntryPoint: function callEntryPoint(assemblyName: string, entrypointMethod: string, args: System_Object[]): void {
// Parse the entrypointMethod, which is of the form MyApp.MyNamespace.MyTypeName::MyMethodName
// Note that we don't support specifying a method overload, so it has to be unique
const entrypointSegments = entrypointMethod.split('::');
if (entrypointSegments.length != 2) {
throw new Error('Malformed entry point method name; could not resolve class name and method name.');
}
const typeFullName = entrypointSegments[0];
const methodName = entrypointSegments[1];
const lastDot = typeFullName.lastIndexOf('.');
const namespace = lastDot > -1 ? typeFullName.substring(0, lastDot) : '';
const typeShortName = lastDot > -1 ? typeFullName.substring(lastDot + 1) : typeFullName;
const entryPointMethodHandle = monoPlatform.findMethod(assemblyName, namespace, typeShortName, methodName);
monoPlatform.callMethod(entryPointMethodHandle, null, args);
callEntryPoint: function callEntryPoint(assemblyName: string): System_Object {
return mono_call_assembly_entry_point(assemblyName, []);
},
callMethod: function callMethod(method: MethodHandle, target: System_Object, args: System_Object[]): System_Object {
@ -272,6 +260,8 @@ function createEmscriptenModuleInstance(loadAssemblyUrls: string[], onReady: ()
'number',
'number',
]);
mono_call_assembly_entry_point = Module.mono_call_assembly_entry_point;
mono_string_get_utf8 = Module.cwrap('mono_wasm_string_get_utf8', 'number', ['number']);
mono_string = Module.cwrap('mono_wasm_string_from_js', 'number', ['string']);

2
src/Components/Web.JS/src/Platform/Mono/MonoTypes.d.ts vendored
View File

@ -9,6 +9,8 @@ declare namespace Module {
// These should probably be in @types/emscripten
function FS_createPath(parent, path, canRead, canWrite);
function FS_createDataFile(parent, name, data, canRead, canWrite, canOwn);
function mono_call_assembly_entry_point(assemblyName: string, args: any[]): any;
}
// Emscripten declares these globals

2
src/Components/Web.JS/src/Platform/Platform.ts
View File

@ -1,7 +1,7 @@
export interface Platform {
start(loadAssemblyUrls: string[]): Promise<void>;
callEntryPoint(assemblyName: string, entrypointMethod: string, args: (System_Object | null)[]);
callEntryPoint(assemblyName: string): System_Object;
findMethod(assemblyName: string, namespace: string, className: string, methodName: string): MethodHandle;
callMethod(method: MethodHandle, target: System_Object | null, args: (System_Object | null)[]): System_Object;