Skip to content

[wasm] Rework fetch #61639

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
lewing merged 8 commits into from
Nov 16, 2021
Merged

[wasm] Rework fetch #61639

Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix the type definitions for UTF8ArrayToString
  • Loading branch information
@lewing
lewing committed Nov 16, 2021
commit e8e2982bb649ebea4b6e7210d45247c5eeff5e5d
5 changes: 2 additions & 3 deletions src/mono/wasm/runtime/startup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ export async function mono_load_runtime_and_bcl_args(args: MonoConfig): Promise<
}

// used from Blazor
export function mono_wasm_load_data_archive(data: TypedArray, prefix: string): boolean {
export function mono_wasm_load_data_archive(data: Uint8Array, prefix: string): boolean {
if (data.length < 8)
return false;

Expand Down Expand Up @@ -451,10 +451,9 @@ export async function mono_wasm_load_config(configFilePath: string): Promise<voi
const module = Module;
module.addRunDependency(configFilePath);
try {
let config = null;
// NOTE: when we add nodejs make sure to include the nodejs fetch package
const configRaw = await _fetch_asset(configFilePath);
config = await configRaw.json();
const config = await configRaw.json();

runtimeHelpers.config = config;
config.environment_variables = config.environment_variables || {};
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/runtime/types/emscripten.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ declare interface EmscriptenModule {
setValue(ptr: VoidPtr, value: number, type: string, noSafe?: number | boolean): void;
setValue(ptr: Int32Ptr, value: number, type: string, noSafe?: number | boolean): void;
getValue(ptr: number, type: string, noSafe?: number | boolean): number;
UTF8ToString(arg: CharPtr): string;
UTF8ArrayToString(str: TypedArray, heap: number[] | number, outIdx: number, maxBytesToWrite?: number): string;
UTF8ToString(ptr: CharPtr, maxBytesToRead?: number): string;
UTF8ArrayToString(u8Array: Uint8Array, idx?: number, maxBytesToRead?: number): string;
FS_createPath(parent: string, path: string, canRead?: boolean, canWrite?: boolean): string;
FS_createDataFile(parent: string, name: string, data: TypedArray, canRead: boolean, canWrite: boolean, canOwn?: boolean): string;
removeRunDependency(id: string): void;
Expand Down