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

Update MonoPlatform startup code to match newer Mono

This commit is contained in:
Steve Sanderson 2018-11-07 10:53:38 +00:00
parent 0857483a42
commit 080399da3d
3 changed files with 32 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/MonoSanity/wwwroot/index.html
View File

@ -75,7 +75,7 @@
<script src="loader.js"></script>
<script>
initMono(['_framework/_bin/MonoSanityClient.dll', '_framework/_bin/MonoSanityClient.pdb'], function () {
initMono(['MonoSanityClient.dll', 'MonoSanityClient.pdb'], function () {
var buttons = document.getElementsByTagName('button');
for (var i = 0; i < buttons.length; i++) {
buttons[i].disabled = false;

108
samples/MonoSanity/wwwroot/loader.js
View File

@ -10,31 +10,31 @@
};
window.initMono = function initMono(loadAssemblyUrls, onReadyCallback) {
window.Browser = {
init: function () { },
asyncLoad: asyncLoad
};
window.Module = {
print: function (line) { console.log(line); },
printEr: function (line) { console.error(line); },
locateFile: function (fileName) {
switch (fileName) {
case 'mono.wasm': return '/_framework/wasm/mono.wasm';
case 'mono.asm.js': return '/_framework/asmjs/mono.asm.js';
default: return fileName;
}
return fileName === 'mono.wasm' ? '/_framework/wasm/mono.wasm' : fileName;
},
preloadPlugins: [],
preRun: [function () {
preloadAssemblies(loadAssemblyUrls);
}],
postRun: [function () {
var load_runtime = Module.cwrap('mono_wasm_load_runtime', null, ['string', 'number']);
load_runtime('appBinDir', 1);
MONO.mono_wasm_runtime_is_ready = true;
onReadyCallback();
}]
onRuntimeInitialized: function () {
var allAssemblyUrls = loadAssemblyUrls.concat([
'netstandard.dll',
'mscorlib.dll',
'System.dll',
'System.Core.dll',
'System.Net.Http.dll'
]);
// For these tests we're using Mono's built-in mono_load_runtime_and_bcl util.
// In real apps we don't use this because we want to have more fine-grained
// control over how the requests are issued, what gets logged, etc., so for
// real apps Blazor's Boot.WebAssembly.ts implements its own equivalent.
MONO.mono_load_runtime_and_bcl(
/* vfx_prefix */ 'myapp', // Virtual filesystem root - arbitrary value
/* deploy_prefix */ '_framework/_bin',
/* enable_debugging */ 1,
allAssemblyUrls,
onReadyCallback
);
}
};
addScriptTagsToDocument();
@ -74,51 +74,6 @@
return mono_string(javaScriptString);
};
function preloadAssemblies(loadAssemblyUrls) {
var loadBclAssemblies = [
'netstandard',
'mscorlib',
'System',
'System.Core',
'System.Net.Http',
];
var allAssemblyUrls = loadAssemblyUrls
.concat(loadBclAssemblies.map(function (name) { return '_framework/_bin/' + name + '.dll'; }));
Module.FS_createPath('/', 'appBinDir', true, true);
MONO.loaded_files = []; // Used by debugger
allAssemblyUrls.forEach(function (url) {
FS.createPreloadedFile('appBinDir', getFileNameFromUrl(url), url, true, false,
/* success */ function() { MONO.loaded_files.push(toAbsoluteUrl(url)); },
/* failure */ function onError(err) { throw err; }
);
});
}
var anchorTagForAbsoluteUrlConversions = document.createElement('a');
function toAbsoluteUrl(possiblyRelativeUrl) {
anchorTagForAbsoluteUrlConversions.href = possiblyRelativeUrl;
return anchorTagForAbsoluteUrlConversions.href;
}
function asyncLoad(url, onload, onerror) {
var xhr = new XMLHttpRequest;
xhr.open('GET', url, /* async: */ true);
xhr.responseType = 'arraybuffer';
xhr.onload = function xhr_onload() {
if (xhr.status === 200 || xhr.status === 0 && xhr.response) {
var asm = new Uint8Array(xhr.response);
onload(asm);
} else {
onerror(xhr);
}
};
xhr.onerror = onerror;
xhr.send(null);
}
function callMethod(method, target, args) {
var stack = Module.stackSave();
var invoke_method = Module.cwrap('mono_wasm_invoke_method', 'number', ['number', 'number', 'number']);
@ -154,29 +109,14 @@
}
function addScriptTagsToDocument() {
// Load either the wasm or asm.js version of the Mono runtime
var browserSupportsNativeWebAssembly = typeof WebAssembly !== 'undefined' && WebAssembly.validate;
var monoRuntimeUrlBase = '/_framework/' + (browserSupportsNativeWebAssembly ? 'wasm' : 'asmjs');
var monoRuntimeScriptUrl = monoRuntimeUrlBase + '/mono.js';
if (!browserSupportsNativeWebAssembly) {
// In the asmjs case, the initial memory structure is in a separate file we need to download
var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest();
meminitXHR.open('GET', monoRuntimeUrlBase + '/mono.js.mem');
meminitXHR.responseType = 'arraybuffer';
meminitXHR.send(null);
throw new Error('This browser does not support WebAssembly.');
}
var scriptElem = document.createElement('script');
scriptElem.src = monoRuntimeScriptUrl;
scriptElem.src = '/_framework/wasm/mono.js';
document.body.appendChild(scriptElem);
}
function getFileNameFromUrl(url) {
var lastSegment = url.substring(url.lastIndexOf('/') + 1);
var queryStringStartPos = lastSegment.indexOf('?');
var filename = queryStringStartPos < 0 ? lastSegment : lastSegment.substring(0, queryStringStartPos);
return filename;
}
})();

11
src/Microsoft.AspNetCore.Blazor.Browser.JS/src/Platform/Mono/MonoPlatform.ts
View File

@ -1,5 +1,5 @@
import { MethodHandle, System_Object, System_String, System_Array, Pointer, Platform } from '../Platform';
import { getAssemblyNameFromUrl, getFileNameFromUrl } from '../Url';
import { getFileNameFromUrl } from '../Url';
import { attachDebuggerHotkey, hasDebuggingEnabled } from './MonoDebugger';
const assemblyHandleCache: { [assemblyName: string]: number } = {};
@ -206,6 +206,7 @@ function createEmscriptenModuleInstance(loadAssemblyUrls: string[], onReady: ()
module.preRun.push(() => {
// By now, emscripten should be initialised enough that we can capture these methods for later use
const mono_wasm_add_assembly = Module.cwrap('mono_wasm_add_assembly', null, ['string', 'number', 'number']);
assembly_load = Module.cwrap('mono_wasm_assembly_load', 'number', ['string']);
find_class = Module.cwrap('mono_wasm_assembly_find_class', 'number', ['number', 'string', 'string']);
find_method = Module.cwrap('mono_wasm_assembly_find_method', 'number', ['number', 'string', 'number']);
@ -213,7 +214,6 @@ function createEmscriptenModuleInstance(loadAssemblyUrls: string[], onReady: ()
mono_string_get_utf8 = Module.cwrap('mono_wasm_string_get_utf8', 'number', ['number']);
mono_string = Module.cwrap('mono_wasm_string_from_js', 'number', ['string']);
Module.FS_createPath('/', appBinDirName, true, true);
MONO.loaded_files = [];
loadAssemblyUrls.forEach(url => {
@ -222,7 +222,10 @@ function createEmscriptenModuleInstance(loadAssemblyUrls: string[], onReady: ()
addRunDependency(runDependencyId);
asyncLoad(url).then(
data => {
Module.FS_createDataFile(appBinDirName, filename, data, true, false, false);
const heapAddress = Module._malloc(data.length);
const heapMemory = new Uint8Array(Module.HEAPU8.buffer, heapAddress, data.length);
heapMemory.set(data);
mono_wasm_add_assembly(filename, heapAddress, data.length);
MONO.loaded_files.push(toAbsoluteUrl(url));
removeRunDependency(runDependencyId);
},
@ -260,7 +263,7 @@ function toAbsoluteUrl(possiblyRelativeUrl: string) {
}
function asyncLoad(url) {
return new Promise((resolve, reject) => {
return new Promise<Uint8Array>((resolve, reject) => {
var xhr = new XMLHttpRequest;
xhr.open('GET', url, /* async: */ true);
xhr.responseType = 'arraybuffer';