[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavelsavara merged 14 commits into from
Aug 2, 2023
Merged

[browser] fix loading assets #89687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4115515
fix loading from assets object
pavelsavara Jul 29, 2023
651debd
fix
pavelsavara Jul 29, 2023
0771bc8
minimal config sample
pavelsavara Jul 29, 2023
ca5e3bc
Merge branch 'main' into browser_fix_loading_assets
pavelsavara Aug 1, 2023
789b1fb
- make sure that we resolve URLs from loadBootResource to absolute UR…
pavelsavara Aug 1, 2023
4fada2e
fix
pavelsavara Aug 1, 2023
6b3f34a
fix config merge
pavelsavara Aug 1, 2023
534f4d2
fix
pavelsavara Aug 1, 2023
a437e6a
fix type
pavelsavara Aug 1, 2023
f0cdbda
feedback @kg
pavelsavara Aug 1, 2023
9762a11
gen
pavelsavara Aug 1, 2023
4225eca
fix
pavelsavara Aug 1, 2023
e7b6885
Merge branch 'main' into browser_fix_loading_assets
pavelsavara Aug 2, 2023
aeb913e
fix test
pavelsavara Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/mono/sample/wasm/browser-advanced/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
},
postRun: () => { console.log('user code Module.postRun'); },
})
.withResourceLoader((type, name, defaultUri, integrity, behavior) => {
// loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
return name;
})
.create();

// at this point both emscripten and monoVM are fully initialized.
Expand Down
18 changes: 18 additions & 0 deletions src/mono/sample/wasm/browser-minimal-config/Program.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
public partial class Test
{
public static int Main(string[] args)
{
Console.WriteLine("Hello minimal config");
return 0;
}
}
}
6 changes: 6 additions & 0 deletions src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\DefaultBrowserSample.targets" />
<ItemGroup>
<WasmExtraFilesToDeploy Include="main.js" />
</ItemGroup>
</Project>
17 changes: 17 additions & 0 deletions src/mono/sample/wasm/browser-minimal-config/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
<title>Wasm Browser Sample</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script type='module' src="./main.js"></script>
</head>

<body>
<h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>
70 changes: 70 additions & 0 deletions src/mono/sample/wasm/browser-minimal-config/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
{
name: "dotnet.native.js",
behavior: "js-module-native"
},
{
name: "dotnet.js",
behavior: "js-module-dotnet"
},
{
name: "dotnet.runtime.js",
behavior: "js-module-runtime"
},
{
name: "dotnet.native.wasm",
behavior: "dotnetwasm"
},
{
name: "System.Private.CoreLib.wasm",
behavior: "assembly"
},
{
name: "System.Runtime.InteropServices.JavaScript.wasm",
behavior: "assembly"
},
{
name: "Wasm.Browser.Config.Sample.wasm",
buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
behavior: "assembly"
},
{
name: "System.Console.wasm",
behavior: "assembly"
},
];

const resources = {
"jsModuleNative": {
"dotnet.native.js": ""
},
"jsModuleRuntime": {
"dotnet.runtime.js": ""
},
"wasmNative": {
"dotnet.native.wasm": ""
},
"assembly": {
"System.Console.wasm": "",
"System.Private.CoreLib.wasm": "",
"System.Runtime.InteropServices.JavaScript.wasm": "",
"Wasm.Browser.Config.Sample.wasm": ""
},
};

const config = {
"mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
assets,
};

await dotnet
.withConfig(config)
.withElementOnExit()
.withExitCodeLogging()
.run();
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
.Union(bootJson.resources.jsModuleRuntime.Keys)
.Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
.Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
.Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
.Union(bootJson.resources.wasmNative.Keys)
.ToArray();

Expand Down
23 changes: 17 additions & 6 deletions src/mono/wasm/runtime/dotnet.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
jsModuleWorker?: ResourceList;
jsModuleNative: ResourceList;
jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
wasmNative: ResourceList;
icu?: ResourceList;
satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
* @param name The name of the resource to be loaded.
* @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
* @param integrity The integrity string representing the expected content in the response.
* @param behavior The detailed behavior/type of the resource to be loaded.
* @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
* When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
*/
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
name: string;
behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
* The binary of the dotnet runtime.
*/
"dotnetwasm"
/**
* The javascript module for loader.
*/
| "js-module-dotnet"
/**
* The javascript module for threads.
*/
| "js-module-threads"
/**
* The javascript module for threads.
* The javascript module for runtime.
*/
| "js-module-runtime"
/**
* The javascript module for threads.
* The javascript module for emscripten.
*/
| "js-module-native"
/**
* Typically blazor.boot.json
*/
| "js-module-native";
| "manifest";
type AssetBehaviors = SingleAssetBehaviors |
/**
* Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
92 changes: 44 additions & 48 deletions src/mono/wasm/runtime/loader/assets.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
"js-module-threads": true,
"js-module-runtime": true,
"js-module-dotnet": true,
"js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

const customSrc = invokeLoadBootResource(asset);
if (typeof (customSrc) === "string") {
asset.resolvedUrl = customSrc;
asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
} else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
}

return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
const asset = await downloadPromise;
if (asset.buffer) {
if (!skipInstantiateByAssetTypes[asset.behavior]) {
const url = asset.pendingDownloadInternal!.url;
mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
const url = asset.resolvedUrl!;
const data = new Uint8Array(asset.buffer!);
cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
const config = loaderHelpers.config;
const resources = loaderHelpers.config.resources;
if (resources) {

// if assets exits, we will assume Net7 legacy and not process resources object
if (config.assets) {
for (const a of config.assets) {
const asset: AssetEntryInternal = a;
mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
mono_assert(typeof asset.name === "string", "asset name must be string");
mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
if (containedInSnapshotByAssetTypes[asset.behavior]) {
containedInSnapshotAssets.push(asset);
} else {
alwaysLoadedAssets.push(asset);
}
}
} else if (config.resources) {
const resources = config.resources;
if (resources.assembly) {
for (const name in resources.assembly) {
containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
}
}

if (resources.jsSymbols) {
for (const name in resources.jsSymbols) {
if (resources.wasmSymbols) {
for (const name in resources.wasmSymbols) {
alwaysLoadedAssets.push({
name,
hash: resources.jsSymbols[name],
hash: resources.wasmSymbols[name],
behavior: "symbols"
});
}
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
}
}

const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

if (loaderHelpers.config.assets) {
for (const a of loaderHelpers.config.assets) {
const asset: AssetEntryInternal = a;
mono_assert(typeof asset === "object", "asset must be object");
mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
mono_assert(typeof asset.name === "string", "asset name must be string");
mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
if (containedInSnapshotByAssetTypes[asset.behavior]) {
containedInSnapshotAssets.push(asset);
} else {
alwaysLoadedAssets.push(asset);
}
}
}

if (!loaderHelpers.config.assets) {
loaderHelpers.config.assets = [];
}

loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
}
if (asset.buffer) {
const buffer = asset.buffer;
asset.buffer = null as any; // GC
if (!asset.resolvedUrl) {
asset.resolvedUrl = "undefined://" + asset.name;
}
asset.pendingDownloadInternal = {
url: "undefined://" + asset.name,
url: asset.resolvedUrl,
name: asset.name,
response: Promise.resolve({
ok: true,
arrayBuffer: () => buffer,
json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
text: () => { throw new Error("NotImplementedException"); },
headers: {
get: () => undefined,
}
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
// They are supplying an entire custom response, so just use that
return customLoadResult;
} else if (typeof customLoadResult === "string") {
// They are supplying a custom URL, so use that with the default fetch behavior
url = customLoadResult;
url = makeURLAbsoluteWithApplicationBase(customLoadResult);
}
}

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
"pdb": "pdb",
"icu": "globalization",
"vfs": "configuration",
"manifest": "manifest",
"dotnetwasm": "dotnetwasm",
"js-module-dotnet": "dotnetjs",
"js-module-native": "dotnetjs",
"js-module-runtime": "dotnetjs",
"js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
const requestHash = request.hash ?? "";
const url = request.resolvedUrl!;

// Try to send with AssetBehaviors
let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
if (!customLoadResult) {
// If we don't get result, try to send with WebAssemblyBootResourceType
const resourceType = monoToBlazorAssetTypeMap[request.behavior];
if (resourceType) {
customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
}
const resourceType = monoToBlazorAssetTypeMap[request.behavior];
if (resourceType) {
return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
}

return customLoadResult;
}

return undefined;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[browser] fix loading assets#89687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pavelsavara
merged 14 commits into

from

Aug 2, 2023
 Merged


[browser] fix loading assets
#89687
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
4115515

fix loading from assets object


pavelsavara Jul 29, 2023
651debd

fix


pavelsavara Jul 29, 2023
0771bc8

minimal config sample


pavelsavara Jul 29, 2023
ca5e3bc

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 1, 2023
789b1fb

- make sure that we resolve URLs from loadBootResource to absolute UR…


pavelsavara Aug 1, 2023
4fada2e

fix


pavelsavara Aug 1, 2023
6b3f34a

fix config merge


pavelsavara Aug 1, 2023
534f4d2

fix


pavelsavara Aug 1, 2023
a437e6a

fix type


pavelsavara Aug 1, 2023
f0cdbda

feedback @kg


pavelsavara Aug 1, 2023
9762a11

gen


pavelsavara Aug 1, 2023
4225eca

fix


pavelsavara Aug 1, 2023
e7b6885

Merge branch 'main' into browser_fix_loading_assets


pavelsavara Aug 2, 2023
aeb913e

fix test


pavelsavara Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
src/mono/sample/wasm/browser-advanced/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ try {
 },
 postRun: () => { console.log('user code Module.postRun'); },
 })
 .withResourceLoader((type, name, defaultUri, integrity, behavior) => {
 // loadBootResource could return string with unqualified name of resource. It assumes that we resolve it with document.baseURI
 return name;
 })
 .create();

 // at this point both emscripten and monoVM are fully initialized.
Expand Down

18 changes: 18 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Program.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
// 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.Runtime.InteropServices.JavaScript;
using System.Runtime.InteropServices;

namespace Sample
{
 public partial class Test
 {
 public static int Main(string[] args)
 {
 Console.WriteLine("Hello minimal config");
 return 0;
 }
 }
}

6 changes: 6 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/Wasm.Browser.Config.Sample.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
 <Import Project="..\DefaultBrowserSample.targets" />
 <ItemGroup>
 <WasmExtraFilesToDeploy Include="main.js" />
 </ItemGroup>
</Project>

17 changes: 17 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/index.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<!-- Licensed to the .NET Foundation under one or more agreements. -->
<!-- The .NET Foundation licenses this file to you under the MIT license. -->
<html>

<head>
 <title>Wasm Browser Sample</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <script type='module' src="./main.js"></script>
</head>

<body>
 <h3 id="header">Wasm Browser Minimal Config Sample</h3>
</body>

</html>

70 changes: 70 additions & 0 deletions
src/mono/sample/wasm/browser-minimal-config/main.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { dotnet } from "./_framework/dotnet.js";

async function fetchBinary(uri) {
 return new Uint8Array(await (await fetch(uri)).arrayBuffer());
}

const assets = [
 {
 name: "dotnet.native.js",
 behavior: "js-module-native"
 },
 {
 name: "dotnet.js",
 behavior: "js-module-dotnet"
 },
 {
 name: "dotnet.runtime.js",
 behavior: "js-module-runtime"
 },
 {
 name: "dotnet.native.wasm",
 behavior: "dotnetwasm"
 },
 {
 name: "System.Private.CoreLib.wasm",
 behavior: "assembly"
 },
 {
 name: "System.Runtime.InteropServices.JavaScript.wasm",
 behavior: "assembly"
 },
 {
 name: "Wasm.Browser.Config.Sample.wasm",
 buffer: await fetchBinary("./_framework/Wasm.Browser.Config.Sample.wasm"),
 behavior: "assembly"
 },
 {
 name: "System.Console.wasm",
 behavior: "assembly"
 },
];

const resources = {
 "jsModuleNative": {
 "dotnet.native.js": ""
 },
 "jsModuleRuntime": {
 "dotnet.runtime.js": ""
 },
 "wasmNative": {
 "dotnet.native.wasm": ""
 },
 "assembly": {
 "System.Console.wasm": "",
 "System.Private.CoreLib.wasm": "",
 "System.Runtime.InteropServices.JavaScript.wasm": "",
 "Wasm.Browser.Config.Sample.wasm": ""
 },
};

const config = {
 "mainAssemblyName": "Wasm.Browser.Config.Sample.dll",
 assets,
};

await dotnet
 .withConfig(config)
 .withElementOnExit()
 .withExitCodeLogging()
 .run();

2 changes: 1 addition & 1 deletion
src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -393,7 +393,7 @@ public void AssertBootJson(AssertBundleOptionsBase options)
 var bootJsonEntries = bootJson.resources.jsModuleNative.Keys
 .Union(bootJson.resources.jsModuleRuntime.Keys)
 .Union(bootJson.resources.jsModuleWorker?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.jsSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmSymbols?.Keys ?? Enumerable.Empty<string>())
 .Union(bootJson.resources.wasmNative.Keys)
 .ToArray();

Expand Down

23 changes: 17 additions & 6 deletions
src/mono/wasm/runtime/dotnet.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ interface ResourceGroups {
 jsModuleWorker?: ResourceList;
 jsModuleNative: ResourceList;
 jsModuleRuntime: ResourceList;
jsSymbols?: ResourceList;
wasmSymbols?: ResourceList;
 wasmNative: ResourceList;
 icu?: ResourceList;
 satelliteResources?: {
Expand All@@ -207,9 +207,11 @@ type ResourceList = {
 * @param name The name of the resource to be loaded.
 * @param defaultUri The URI from which the framework would fetch the resource by default. The URI may be relative or absolute.
 * @param integrity The integrity string representing the expected content in the response.
 * @param behavior The detailed behavior/type of the resource to be loaded.
 * @returns A URI string or a Response promise to override the loading process, or null/undefined to allow the default loading behavior.
 * When returned string is not qualified with `./` or absolute URL, it will be resolved against the application base URI.
 */
type LoadBootResourceCallback = (type: AssetBehaviors | "manifest", name: string, defaultUri: string, integrity: string) => string | Promise<Response> | null | undefined;
type LoadBootResourceCallback = (type: WebAssemblyBootResourceType, name: string, defaultUri: string, integrity: string, behavior: AssetBehaviors) => string | Promise<Response> | null | undefined;
interface ResourceRequest {
 name: string;
 behavior: AssetBehaviors;
Expand DownExpand Up@@ -254,18 +256,26 @@ type SingleAssetBehaviors =
 * The binary of the dotnet runtime.
 */
"dotnetwasm"
/**
 * The javascript module for loader.
 */
 | "js-module-dotnet"
/**
 * The javascript module for threads.
 */
 | "js-module-threads"
/**
 * The javascript module for threads.
 * The javascript module for runtime.
 */
 | "js-module-runtime"
/**
 * The javascript module for threads.
 * The javascript module for emscripten.
 */
 | "js-module-native"
/**
 * Typically blazor.boot.json
 */
 | "js-module-native";
 | "manifest";
type AssetBehaviors = SingleAssetBehaviors | 
/**
 * Load asset as a managed resource assembly.
Expand DownExpand Up@@ -396,6 +406,7 @@ type ModuleAPI = {
 exit: (code: number, reason?: any) => void;
};
type CreateDotnetRuntimeType = (moduleFactory: DotnetModuleConfig | ((api: RuntimeAPI) => DotnetModuleConfig)) => Promise<RuntimeAPI>;
type WebAssemblyBootResourceType = "assembly" | "pdb" | "dotnetjs" | "dotnetwasm" | "globalization" | "manifest" | "configuration";

interface IDisposable {
 dispose(): void;
Expand DownExpand Up@@ -431,4 +442,4 @@ declare global {
}
declare const createDotnetRuntime: CreateDotnetRuntimeType;

export { AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };
export { AssetBehaviors, AssetEntry, CreateDotnetRuntimeType, DotnetHostBuilder, DotnetModuleConfig, EmscriptenModule, GlobalizationMode, IMemoryView, ModuleAPI, MonoConfig, ResourceRequest, RuntimeAPI, createDotnetRuntime as default, dotnet, exit };

92 changes: 44 additions & 48 deletions
src/mono/wasm/runtime/loader/assets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,8 @@ import { mono_log_debug } from "./logging";
import { mono_exit } from "./exit";
import { addCachedReponse, findCachedResponse, isCacheAvailable } from "./assetsCache";
import { getIcuResourceName } from "./icu";
import { mono_log_warn } from "./logging";
import { makeURLAbsoluteWithApplicationBase } from "./polyfills";


let throttlingPromise: PromiseAndController<void> | undefined;
Expand All@@ -20,6 +22,7 @@ const jsModulesAssetTypes: {
} = {
 "js-module-threads": true,
 "js-module-runtime": true,
 "js-module-dotnet": true,
 "js-module-native": true,
};

Expand DownExpand Up@@ -78,10 +81,10 @@ function getSingleAssetWithResolvedUrl(resources: ResourceList | undefined, beha

 const customSrc = invokeLoadBootResource(asset);
 if (typeof (customSrc) === "string") {
 asset.resolvedUrl = customSrc;
 asset.resolvedUrl = makeURLAbsoluteWithApplicationBase(customSrc);
 } else if (customSrc) {
// Since we must load this via a import, it's only valid to supply a URI (and not a Request, say)
throw new Error(`For a ${behavior} resource, custom loaders must supply a URI string.`);
mono_log_warn(`For ${behavior} resource: ${name}, custom loaders must supply a URI string.`);
// we apply a default URL
 }

 return asset;
Expand DownExpand Up@@ -164,8 +167,9 @@ export async function mono_download_assets(): Promise<void> {
 const asset = await downloadPromise;
 if (asset.buffer) {
 if (!skipInstantiateByAssetTypes[asset.behavior]) {
 const url = asset.pendingDownloadInternal!.url;
 mono_assert(asset.buffer && typeof asset.buffer === "object", "asset buffer must be array or buffer like");
 mono_assert(typeof asset.resolvedUrl === "string", "resolvedUrl must be string");
 const url = asset.resolvedUrl!;
 const data = new Uint8Array(asset.buffer!);
 cleanupAsset(asset);

Expand DownExpand Up@@ -220,8 +224,25 @@ export async function mono_download_assets(): Promise<void> {

function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLoadedAssets: AssetEntryInternal[]) {
 const config = loaderHelpers.config;
 const resources = loaderHelpers.config.resources;
 if (resources) {

 // if assets exits, we will assume Net7 legacy and not process resources object
 if (config.assets) {
 for (const a of config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", () => `asset must be object, it was ${typeof asset} : ${asset}`);
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 } else if (config.resources) {
 const resources = config.resources;
 if (resources.assembly) {
 for (const name in resources.assembly) {
 containedInSnapshotAssets.push({
Expand DownExpand Up@@ -282,11 +303,11 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 if (resources.jsSymbols) {
 for (const name in resources.jsSymbols) {
 if (resources.wasmSymbols) {
 for (const name in resources.wasmSymbols) {
 alwaysLoadedAssets.push({
 name,
 hash: resources.jsSymbols[name],
 hash: resources.wasmSymbols[name],
 behavior: "symbols"
 });
 }
Expand All@@ -307,31 +328,7 @@ function prepareAssets(containedInSnapshotAssets: AssetEntryInternal[], alwaysLo
 }
 }

 const newAssets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];

 if (loaderHelpers.config.assets) {
 for (const a of loaderHelpers.config.assets) {
 const asset: AssetEntryInternal = a;
 mono_assert(typeof asset === "object", "asset must be object");
 mono_assert(typeof asset.behavior === "string", "asset behavior must be known string");
 mono_assert(typeof asset.name === "string", "asset name must be string");
 mono_assert(!asset.resolvedUrl || typeof asset.resolvedUrl === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.hash || typeof asset.hash === "string", "asset resolvedUrl could be string");
 mono_assert(!asset.pendingDownload || typeof asset.pendingDownload === "object", "asset pendingDownload could be object");
 if (containedInSnapshotByAssetTypes[asset.behavior]) {
 containedInSnapshotAssets.push(asset);
 } else {
 alwaysLoadedAssets.push(asset);
 }
 }
 }

 if (!loaderHelpers.config.assets) {
 loaderHelpers.config.assets = [];
 }

 loaderHelpers.config.assets = [...loaderHelpers.config.assets, ...newAssets];

 config.assets = [...containedInSnapshotAssets, ...alwaysLoadedAssets];
}

export function delay(ms: number): Promise<void> {
Expand DownExpand Up@@ -431,12 +428,17 @@ async function start_asset_download_sources(asset: AssetEntryInternal): Promise<
 }
 if (asset.buffer) {
 const buffer = asset.buffer;
 asset.buffer = null as any; // GC
 if (!asset.resolvedUrl) {
 asset.resolvedUrl = "undefined://" + asset.name;
 }
 asset.pendingDownloadInternal = {
 url: "undefined://" + asset.name,
 url: asset.resolvedUrl,
 name: asset.name,
 response: Promise.resolve({
 ok: true,
 arrayBuffer: () => buffer,
 json: () => JSON.parse(new TextDecoder("utf-8").decode(buffer)),
 text: () => { throw new Error("NotImplementedException"); },
 headers: {
 get: () => undefined,
 }
Expand DownExpand Up@@ -585,8 +587,7 @@ function fetchResource(request: ResourceRequest): Promise<Response> {
 // They are supplying an entire custom response, so just use that
 return customLoadResult;
 } else if (typeof customLoadResult === "string") {
 // They are supplying a custom URL, so use that with the default fetch behavior
 url = customLoadResult;
 url = makeURLAbsoluteWithApplicationBase(customLoadResult);
 }
 }

Expand DownExpand Up@@ -614,7 +615,9 @@ const monoToBlazorAssetTypeMap: { [key: string]: WebAssemblyBootResourceType | u
 "pdb": "pdb",
 "icu": "globalization",
 "vfs": "configuration",
 "manifest": "manifest",
 "dotnetwasm": "dotnetwasm",
 "js-module-dotnet": "dotnetjs",
 "js-module-native": "dotnetjs",
 "js-module-runtime": "dotnetjs",
 "js-module-threads": "dotnetjs"
Expand All@@ -625,17 +628,10 @@ function invokeLoadBootResource(request: ResourceRequest): string | Promise<Resp
 const requestHash = request.hash ?? "";
 const url = request.resolvedUrl!;

 // Try to send with AssetBehaviors
 let customLoadResult = loaderHelpers.loadBootResource(request.behavior, request.name, url, requestHash);
 if (!customLoadResult) {
 // If we don't get result, try to send with WebAssemblyBootResourceType
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 customLoadResult = loaderHelpers.loadBootResource(resourceType as AssetBehaviors, request.name, url, requestHash);
 }
 const resourceType = monoToBlazorAssetTypeMap[request.behavior];
 if (resourceType) {
 return loaderHelpers.loadBootResource(resourceType, request.name, url, requestHash, request.behavior);
 }

 return customLoadResult;
 }

 return undefined;
Expand Down
Loading