From d763633781be484bb19b458208dd7c11efb83228 Mon Sep 17 00:00:00 2001 From: Andreu Botella Date: Fri, 26 Nov 2021 09:52:41 +0100 Subject: feat(etc/fetch): Support `WebAssembly.instantiateStreaming` for file fetches (#12901) 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. --- ext/fetch/26_fetch.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'ext/fetch') diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js index 47d8b2e85..a66146bee 100644 --- a/ext/fetch/26_fetch.js +++ b/ext/fetch/26_fetch.js @@ -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. -- cgit v1.2.3