foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-11 16:42:21 -05:00
Code Issues Packages 1 Wiki Activity

feat(etc/fetch): Support WebAssembly.instantiateStreaming for file fetches (#12901)

Browse source 
Fetching of local files, added in #12545, returns a response with no
headers, including the `Content-Type` header. This currently makes it
not work with the WebAssembly streaming APIs, which require the response
to have a content type of `application/wasm`.

Since the only way to obtain a `Response` object with a non-empty `url`
field is via `fetch()`, this change changes the content type requirement
to only apply to responses whose url has the `file:` scheme.
This commit is contained in:
Andreu Botella 2021-11-26 09:52:41 +01:00 committed by GitHub
parent 6a780543a4
commit d763633781
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/tests/unit/wasm_test.ts
View file

@ -76,6 +76,20 @@ Deno.test(async function wasmInstantiateStreaming() {
assertEquals(add(1, 3), 4);
});
Deno.test(
{ permissions: { read: true } },
async function wasmFileStreaming() {
const url = new URL("../testdata/unreachable.wasm", import.meta.url);
assert(url.href.startsWith("file://"));
const { module } = await WebAssembly.instantiateStreaming(fetch(url));
assertEquals(WebAssembly.Module.exports(module), [{
name: "unreachable",
kind: "function",
}]);
},
);
Deno.test(
{ permissions: { net: true } },
async function wasmStreamingNonTrivial() {

17
ext/fetch/26_fetch.js
View file

@ -37,6 +37,7 @@
PromisePrototypeThen,
PromisePrototypeCatch,
String,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeSubarray,
TypeError,
@ -498,12 +499,16 @@
// The spec is ambiguous here, see
// https://github.com/WebAssembly/spec/issues/1138. The WPT tests
// expect the raw value of the Content-Type attribute lowercased.
const contentType = res.headers.get("Content-Type");
if (
typeof contentType !== "string" ||
StringPrototypeToLowerCase(contentType) !== "application/wasm"
) {
throw new TypeError("Invalid WebAssembly content type.");
// We ignore this for file:// because file fetches don't have a
// Content-Type.
if (!StringPrototypeStartsWith(res.url, "file://")) {
const contentType = res.headers.get("Content-Type");
if (
typeof contentType !== "string" ||
StringPrototypeToLowerCase(contentType) !== "application/wasm"
) {
throw new TypeError("Invalid WebAssembly content type.");
}
}
// 2.5.