Skip to content

Fix: race-network-and-fetch-handler now uses actual |raceResponse| #1777

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
merged 11 commits into from
Jun 13, 2025
Merged

Fix: race-network-and-fetch-handler now uses actual |raceResponse| #1777

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f2d5c72
add race-network-and-cache
monica-ch Apr 16, 2025
c39d796
update failure cases
monica-ch Apr 17, 2025
f206baf
Follow spec format
monica-ch Apr 20, 2025
7102987
use |raceResponse| when empty
monica-ch Apr 22, 2025
c9a9907
Remove race-network-and-cache source enum etc.
yoshisatoyanagisawa Jun 10, 2025
9a14512
Remove unnecessary change to the enum
yoshisatoyanagisawa Jun 10, 2025
8eec31a
Update docs/index.bs
yoshisatoyanagisawa Jun 11, 2025
c02659f
Assuming that the fetch event part always get queued
yoshisatoyanagisawa Jun 11, 2025
e2a3f08
Flag flip if |networkFetchResult| is set.
yoshisatoyanagisawa Jun 12, 2025
5006fff
Remove |networkFetchCompleted| and |networkFetchResult|
yoshisatoyanagisawa Jun 12, 2025
51832d8
No need to wait for |raceResponse|
yoshisatoyanagisawa Jun 12, 2025
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
14 changes: 9 additions & 5 deletions docs/index.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3265,11 +3265,10 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
1. Let |raceResponse| be a [=race response=] whose [=race response/value=] is "<code>pending</code>".
1. Run the following substeps [=in parallel=], but [=abort when=] |fetchController|'s [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The existing setup seems a bit fragile to me. The definition of abort when only operates between steps, and there are only two steps nested under "If aborted"... In fact there is only one step before this PR.

Probably there should be a check on fetchController's state inside the processResponse callback?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not confident but I tried to address that with #1779.
Is it what you meant?

1. Set |raceFetchController| to the result of calling [=fetch=] given |request|, with [=fetch/processResponse=] set to the following steps given a [=/response=] |raceNetworkRequestResponse|:
1. Set |raceResponse|'s [=race response/value=] to |raceNetworkRequestResponse|.
1. If |raceNetworkRequestResponse|'s [=response/status=] is [=ok status=], then:
1. Set |raceResponse|'s [=race response/value=] to |raceNetworkRequestResponse|.
1. Let |raceNetworkResult| be a [=race result=] whose [=race result/routed response=] is |raceNetworkRequestResponse| and [=race result/used route=] is {{RouterSourceEnum/"network"}}.
1. [=queue/Enqueue=] |raceNetworkResult| to |queue|.
1. Otherwise, set |raceResponse|'s [=race response/value=] to a [=network error=].
1. [=If aborted=] and |raceFetchController| is not null, then:
1. [=fetch controller/Abort=] |raceFetchController|.
1. Set |raceResponse| to a [=race response=] whose [=race response/value=] is null.
Expand All @@ -3282,6 +3281,8 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
1. Wait until |queue| is not empty.
1. Let |result| be the result of [=dequeue=] |queue|.
1. Let |routedResponse| be |result|'s [=race result/routed response=].
1. If |routedResponse| is null:
1. Return |timingInfo|.
1. If |result|'s [=race result/used route=] is {{RouterSourceEnum/"network"}}, then:
1. Set |routedResponse|'s [=service worker timing info=] be set to |timingInfo|.
1. Set |routedResponse|'s [=service worker timing info=]'s [=service worker timing info/worker final router source=] be set to |result|'s [=race result/used route=].
Expand Down Expand Up @@ -3340,6 +3341,9 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
1. Let |eventHandled| be null.
1. Let |handleFetchFailed| be false.
1. Let |respondWithEntered| be false.
1. Let |networkError| be a [=network error=].
1. If |raceResponse| is not null:
1. Set |networkError|'s [=response/service worker timing info=] to |timingInfo|.
1. Let |shouldSoftUpdate| be true if any of the following are true, and false otherwise:
* |request| is a [=non-subresource request=].
* |request| is a [=subresource request=] and |registration| is [=stale=].
Expand Down Expand Up @@ -3399,15 +3403,15 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
1. If |respondWithEntered| is false, then:
1. If |eventCanceled| is true, then:
1. If |eventHandled| is not null, then [=reject=] |eventHandled| with a "{{NetworkError}}" {{DOMException}} in |workerRealm|.
2. Return a [=network error=].
2. Return |networkError|.
1. If |eventHandled| is not null, then [=resolve=] |eventHandled|.
1. If |raceResponse|'s [=race response/value=] is not null, then:
1. If |raceResponse| is not null, and |raceResponse|'s [=race response/value=] is not null, then:
1. Wait until |raceResponse|'s [=race response/value=] is not "<code>pending</code>".
1. If |raceResponse|'s [=race response/value=] is a [=/response=], return |raceResponse|'s [=race response/value=].
1. Return null.
1. If |handleFetchFailed| is true, then:
1. If |eventHandled| is not null, then [=reject=] |eventHandled| with a "{{NetworkError}}" {{DOMException}} in |workerRealm|.
2. Return a [=network error=].
2. Return |networkError|.
1. If |eventHandled| is not null, then [=resolve=] |eventHandled|.
1. Return |response|.
</section>
Expand Down