-
Notifications
You must be signed in to change notification settings - Fork 525
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.
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
cacheStorage: fix bugs make wpts pass #2596
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,14 +112,12 @@ class Cache { | |
// 5.5.2 | ||
for (const response of responses) { | ||
// 5.5.2.1 | ||
const responseObject = new Response(response.body?.source ?? null) | ||
const body = responseObject[kState].body | ||
const responseObject = new Response(null) | ||
responseObject[kState] = response | ||
responseObject[kState].body = body | ||
responseObject[kHeaders][kHeadersList] = response.headersList | ||
responseObject[kHeaders][kGuard] = 'immutable' | ||
|
||
responseList.push(responseObject) | ||
responseList.push(responseObject.clone()) | ||
} | ||
|
||
// 6. | ||
|
@@ -146,16 +144,24 @@ class Cache { | |
webidl.brandCheck(this, Cache) | ||
webidl.argumentLengthCheck(arguments, 1, { header: 'Cache.addAll' }) | ||
|
||
requests = webidl.converters['sequence<RequestInfo>'](requests) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is weird: any value is technically allowed in RequestInfo (it gets stringified and then parsed as a URL with the window's location typically), but undefined is very explicitly not allowed here for some reason. |
||
|
||
// 1. | ||
const responsePromises = [] | ||
|
||
// 2. | ||
const requestList = [] | ||
|
||
// 3. | ||
for (const request of requests) { | ||
for (let request of requests) { | ||
if (request === undefined) { | ||
throw webidl.errors.conversionFailed({ | ||
prefix: 'Cache.addAll', | ||
argument: 'Argument 1', | ||
types: ['undefined is not allowed'] | ||
}) | ||
} | ||
|
||
request = webidl.converters.RequestInfo(request) | ||
|
||
if (typeof request === 'string') { | ||
continue | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is weird: this whole thing i'm kinda iffy about, somehow this was setting a 0-length uint8array as the source and was locking the stream.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the cloning itself makes sense, if you matched a Response and then consumed its body, the cached stream would be locked if you matched it again. I'm referring to the chunk above it, which github cut off.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How is the body assigned to the new response?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
response
here is actually an internal response, not a Response object. It contains the body.