Skip to content

[WASM] Add a browser module #531

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
windelbouwman merged 10 commits into from
Feb 24, 2019
Merged

[WASM] Add a browser module #531

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9c0bcc2
Re-add WASM fetch builtin
coolreader18 Feb 18, 2019
4edca21
Convert some fetch options to kwargs, add PyFuncArgs method
coolreader18 Feb 18, 2019
92a3733
Add body option to fetch
coolreader18 Feb 18, 2019
d716313
Add content_type option to headers
coolreader18 Feb 18, 2019
5a472e4
Merge branch 'master' into wasm-fetch-builtin
coolreader18 Feb 23, 2019
fd184a1
Add a WASM browser module with fetch() available
coolreader18 Feb 23, 2019
ff66bb6
Follow clippy's advice
coolreader18 Feb 23, 2019
7f626b5
Merge branch 'master' into wasm-fetch-builtin
coolreader18 Feb 23, 2019
2b9adfe
Add fetch demo snippet
coolreader18 Feb 23, 2019
9d99f94
Add!
coolreader18 Feb 23, 2019
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
Add content_type option to headers
  • Loading branch information
@coolreader18
coolreader18 committed Feb 18, 2019
commit d7163132831be7231b52115d74bc8110c71ac85b
8 changes: 8 additions & 0 deletions wasm/lib/src/wasm_builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ fn builtin_fetch(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
let method = args.get_optional_kwarg_with_type("method", vm.ctx.str_type(), vm)?;
let headers = args.get_optional_kwarg_with_type("headers", vm.ctx.dict_type(), vm)?;
let body = args.get_optional_kwarg("body");
let content_type = args.get_optional_kwarg_with_type("content_type", vm.ctx.str_type(), vm)?;

let response_format = match response_format {
Some(s) => FetchResponseFormat::from_str(vm, &objstr::get_value(&s))?,
Expand Down Expand Up @@ -176,6 +177,13 @@ fn builtin_fetch(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
}
}

if let Some(content_type) = content_type {
request
.headers()
.set("Content-Type", &objstr::get_value(&content_type))
.map_err(|err| convert::js_py_typeerror(vm, err))?;
}

let window = window();
let request_prom = window.fetch_with_request(&request);

Expand Down