Skip to content
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

[wasm] Rework fetch #61639

Merged
merged 8 commits into from
Nov 16, 2021
Merged

[wasm] Rework fetch #61639

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2178a57
Unify some code
lewing Nov 15, 2021
8eb230a
Work around v8 not having a nice way to convert to string
lewing Nov 16, 2021
c7bef9e
redo naming and formatting
lewing Nov 16, 2021
3b2e5ce
do it all aync
lewing Nov 16, 2021
d9438a4
Trap more exceptions again and drop _get_fetch_implmentation
lewing Nov 16, 2021
e8e2982
Fix the type definitions for UTF8ArrayToString
lewing Nov 16, 2021
07c6f90
Fix accidental sync call
lewing Nov 16, 2021
3bfbd66
Remove TypedArray import
lewing Nov 16, 2021
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
94 changes: 40 additions & 54 deletions src/mono/wasm/runtime/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,42 @@ export function mono_wasm_set_runtime_options(options: string[]): void {
cwraps.mono_wasm_parse_runtime_options(options.length, argv);
}

async function _fetch_asset(url: string): Promise<Response> {
try {
if (typeof (fetch) === "function") {
return fetch(url, { credentials: "same-origin" });
}
else if (ENVIRONMENT_IS_NODE) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const fs = require("fs");
Copy link
Member

@pavelsavara pavelsavara Nov 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will do require for each call of the _fetch_asset. I admit the previous implementation had the same issue.

const arrayBuffer = await fs.readFileSync(url);
return <Response><any> {
ok: true,
url,
arrayBuffer: () => arrayBuffer,
json: () => JSON.parse(arrayBuffer)
};
}
else if (typeof (read) === "function") {
return <Response><any> {
ok: true,
url,
arrayBuffer: () => new Uint8Array(read(url, "binary")),
json: () => JSON.parse(read(url))
};
}
}
catch (e) {
return <Response><any> {
ok: false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe store the error as a property so the caller can find out what the error was without an extra throw+catch

url,
arrayBuffer: () => { throw e; },
json: () => { throw e; }
};
}
throw new Error("No fetch implementation available");
}

function _handle_fetched_asset(ctx: MonoInitContext, asset: AssetEntry, url: string, blob: ArrayBuffer) {
const bytes = new Uint8Array(blob);
if (ctx.tracing)
Expand Down Expand Up @@ -143,47 +179,6 @@ function _apply_configuration_from_args(args: MonoConfig) {
mono_wasm_init_coverage_profiler(args.coverage_profiler_options);
}

function _get_fetch_implementation(args: MonoConfig): (asset: string) => Promise<Response> {
if (typeof (args.fetch_file_cb) === "function")
return args.fetch_file_cb;

if (typeof (fetch) === "function") {
return function (asset) {
return fetch(asset, { credentials: "same-origin" });
};
} else if (ENVIRONMENT_IS_NODE || typeof (read) === "function") {
return async function (asset) {
let data: any = null;
let err: any = null;
try {
if (ENVIRONMENT_IS_NODE) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const fs = require("fs");
data = await fs.promises.readFile(asset);
}
else {
data = read(asset, "binary");
}
}
catch (exc) {
data = null;
err = exc;
}
const res: any = {
ok: !!data,
url: asset,
arrayBuffer: async function () {
if (err) throw err;
return new Uint8Array(data);
}
};
return <Response>res;
};
} else {
throw new Error("No fetch_file_cb was provided and this environment does not expose 'fetch'.");
}
}

function _finalize_startup(args: MonoConfig, ctx: MonoInitContext) {
const moduleExt = Module as EmscriptenModuleMono;

Expand Down Expand Up @@ -316,7 +311,7 @@ export async function mono_load_runtime_and_bcl_args(args: MonoConfig): Promise<

_apply_configuration_from_args(args);

const local_fetch = _get_fetch_implementation(args);
const local_fetch = typeof (args.fetch_file_cb) === "function" ? args.fetch_file_cb : _fetch_asset;
pavelsavara marked this conversation as resolved.
Show resolved Hide resolved

const load_asset = async (asset: AllAssetEntryTypes): Promise<void> => {
//TODO we could do module.addRunDependency(asset.name) and delay emscripten run() after all assets are loaded
Expand Down Expand Up @@ -458,18 +453,9 @@ export async function mono_wasm_load_config(configFilePath: string): Promise<voi
try {
let config = null;
// NOTE: when we add nodejs make sure to include the nodejs fetch package
if (ENVIRONMENT_IS_WEB) {
const configRaw = await fetch(configFilePath);
config = await configRaw.json();
} else if (ENVIRONMENT_IS_NODE) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const fs = require("fs");
const json = await fs.promises.readFile(configFilePath);
config = JSON.parse(json);
} else { // shell or worker
const json = read(configFilePath);// read is a v8 debugger command
config = JSON.parse(json);
}
const configRaw = await _fetch_asset(configFilePath);
config = await configRaw.json();

runtimeHelpers.config = config;
config.environment_variables = config.environment_variables || {};
config.assets = config.assets || [];
Expand Down