Handle Fetch: Use correct storage key for subresource requests (#1790)

SHA: 3ab2b8a
Reason: push, by yoshisatoyanagisawa

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: yoshisatoyanagisawa

docs/index.html

@@ -7,7 +7,7 @@
   <link href="https://www.w3.org/StyleSheets/TR/2021/W3C-ED" rel="stylesheet">
   <meta content="Bikeshed version 3f621ba99, updated Mon Jul 28 15:38:36 2025 -0700" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
-  <meta content="953b6d33ba2b693f932a9476b89fd1f1412056b6" name="revision">
+  <meta content="3ab2b8accba713c6f7ba69126beb9d45245bbca9" name="revision">
   <meta content="dark light" name="color-scheme">
   <link href="https://www.w3.org/StyleSheets/TR/2021/dark.css" media="(prefers-color-scheme: dark)" rel="stylesheet" type="text/css">
 <style>/* Boilerplate: style-autolinks */
@@ -966,7 +966,7 @@
 </p>
    <h1 class="p-name no-ref" id="title">Service Workers Nightly</h1>
    <p id="w3c-state"><a href="https://www.w3.org/standards/types/#ED">Editor’s Draft</a>,
-    <time class="dt-updated" datetime="2025-09-04">4 September 2025</time></p>
+    <time class="dt-updated" datetime="2025-09-09">9 September 2025</time></p>
    <details open>
     <summary>More details about this document</summary>
     <div data-fill-with="spec-metadata">
@@ -5356,7 +5356,21 @@ <h3 class="heading settled" id="on-fetch-request-algorithm"><span class="content
             <li data-md>
              <p>Set <var>timingInfo</var>’s <a data-link-type="dfn" href="#service-worker-timing-info-worker-cache-lookup-start" id="ref-for-service-worker-timing-info-worker-cache-lookup-start">worker cache lookup start</a> to the <a data-link-type="dfn" href="https://w3c.github.io/hr-time/#dfn-coarsened-shared-current-time" id="ref-for-dfn-coarsened-shared-current-time①">coarsened shared current time</a> given <var>useHighResPerformanceTimers</var>.</p>
             <li data-md>
-             <p>Let <var>caches</var> be the result of running <a data-link-type="dfn" href="https://storage.spec.whatwg.org/#obtain-a-local-storage-bottle-map" id="ref-for-obtain-a-local-storage-bottle-map">obtain a local storage bottle map</a> with <var>reservedClient</var> and "<code>caches</code>".</p>
+             <p>Let <var>environment</var> be null.</p>
+            <li data-md>
+             <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request②">non-subresource request</a>, then:</p>
+             <ol>
+              <li data-md>
+               <p>Set <var>environment</var> to <var>reservedClient</var>.</p>
+             </ol>
+            <li data-md>
+             <p>Else:</p>
+             <ol>
+              <li data-md>
+               <p>Set <var>environment</var> to <var>client</var>.</p>
+             </ol>
+            <li data-md>
+             <p>Let <var>caches</var> be the result of running <a data-link-type="dfn" href="https://storage.spec.whatwg.org/#obtain-a-local-storage-bottle-map" id="ref-for-obtain-a-local-storage-bottle-map">obtain a local storage bottle map</a> with <var>environment</var> and "<code>caches</code>".</p>
             <li data-md>
              <p><a data-link-type="dfn" href="https://infra.spec.whatwg.org/#map-iterate" id="ref-for-map-iterate⑥">For each</a> <var>cacheName</var> → <var>cache</var> of <var>caches</var>.</p>
              <ol>
@@ -5635,7 +5649,7 @@ <h3 class="heading settled" id="create-fetch-event-and-dispatch-algorithm"><span
        <p>Let <var>shouldSoftUpdate</var> be true if any of the following are true, and false otherwise:</p>
        <ul>
         <li data-md>
-         <p><var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request②">non-subresource request</a>.</p>
+         <p><var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request③">non-subresource request</a>.</p>
         <li data-md>
          <p><var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#subresource-request" id="ref-for-subresource-request②">subresource request</a> and <var>registration</var> is <a data-link-type="dfn" href="#service-worker-registration-stale" id="ref-for-service-worker-registration-stale④">stale</a>.</p>
        </ul>
@@ -5700,7 +5714,7 @@ <h3 class="heading settled" id="create-fetch-event-and-dispatch-algorithm"><span
           <li data-md>
            <p>Initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-clientid" id="ref-for-dom-fetchevent-clientid②">clientId</a></code> attribute to <var>client</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-id" id="ref-for-concept-environment-id③">id</a>.</p>
           <li data-md>
-           <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request③">non-subresource request</a> and <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination" id="ref-for-concept-request-destination⑤">destination</a> is not <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#dom-requestdestination-report" id="ref-for-dom-requestdestination-report①">"report"</a></code>, initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-resultingclientid" id="ref-for-dom-fetchevent-resultingclientid②">resultingClientId</a></code> attribute to <var>reservedClient</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-id" id="ref-for-concept-environment-id④">id</a>, and to the empty string otherwise.</p>
+           <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request④">non-subresource request</a> and <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-destination" id="ref-for-concept-request-destination⑤">destination</a> is not <code class="idl"><a data-link-type="idl" href="https://fetch.spec.whatwg.org/#dom-requestdestination-report" id="ref-for-dom-requestdestination-report①">"report"</a></code>, initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-resultingclientid" id="ref-for-dom-fetchevent-resultingclientid②">resultingClientId</a></code> attribute to <var>reservedClient</var>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-environment-id" id="ref-for-concept-environment-id④">id</a>, and to the empty string otherwise.</p>
           <li data-md>
            <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#navigation-request" id="ref-for-navigation-request②">navigation request</a>, initialize <var>e</var>’s <code class="idl"><a data-link-type="idl" href="#dom-fetchevent-replacesclientid" id="ref-for-dom-fetchevent-replacesclientid②">replacesClientId</a></code> attribute to <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-replaces-client-id" id="ref-for-concept-request-replaces-client-id">replaces client id</a>, and to the empty string otherwise.</p>
           <li data-md>
@@ -7048,7 +7062,7 @@ <h3 class="heading settled" id="lookup-race-response-algorithm"><span class="con
       <li data-md>
        <p>Let <var>registration</var> be null.</p>
       <li data-md>
-       <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request④">non-subresource request</a>, then:</p>
+       <p>If <var>request</var> is a <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#non-subresource-request" id="ref-for-non-subresource-request⑤">non-subresource request</a>, then:</p>
        <ol>
         <li data-md>
          <p>If <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-reserved-client" id="ref-for-concept-request-reserved-client②">reserved client</a> is null, return null.</p>
@@ -10409,7 +10423,7 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
 "5991ccfb": {"dfnID":"5991ccfb","dfnText":"relevant realm","external":true,"refSections":[{"refs":[{"id":"ref-for-concept-relevant-realm"}],"title":"3.4.5. getRegistrations()"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2460"}],"title":"4.2.6. postMessage(message, options)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2461"}],"title":"4.3.2. matchAll(options)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2462"}],"title":"4.6.7. event.respondWith(r)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2463"}],"title":"5.4.2. matchAll(request, options)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2464"}],"title":"5.4.4. addAll(requests)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2465"}],"title":"5.4.5. put(request, response)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2466"}],"title":"5.4.6. delete(request, options)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2467"}],"title":"5.4.7. keys(request, options)"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2468"},{"id":"ref-for-concept-relevant-realm\u2460\u24ea"}],"title":"Create Fetch Event and Dispatch"},{"refs":[{"id":"ref-for-concept-relevant-realm\u2460\u2460"}],"title":"Fire Functional Event"}],"url":"https://html.spec.whatwg.org/multipage/webappapis.html#concept-relevant-realm"},
 "59ed4e57": {"dfnID":"59ed4e57","dfnText":"ReadableStream","external":true,"refSections":[{"refs":[{"id":"ref-for-readablestream"}],"title":"4.6.7. event.respondWith(r)"}],"url":"https://streams.spec.whatwg.org/#readablestream"},
 "59f47681": {"dfnID":"59f47681","dfnText":"blob URL","external":true,"refSections":[{"refs":[{"id":"ref-for-blob-url"}],"title":"2.5.2. The worker client case"},{"refs":[{"id":"ref-for-blob-url\u2460"}],"title":"2.5. Control and Use"}],"url":"https://w3c.github.io/FileAPI/#blob-url"},
-"5a391458": {"dfnID":"5a391458","dfnText":"non-subresource request","external":true,"refSections":[{"refs":[{"id":"ref-for-non-subresource-request"},{"id":"ref-for-non-subresource-request\u2460"}],"title":"Handle Fetch"},{"refs":[{"id":"ref-for-non-subresource-request\u2461"},{"id":"ref-for-non-subresource-request\u2462"}],"title":"Create Fetch Event and Dispatch"},{"refs":[{"id":"ref-for-non-subresource-request\u2463"}],"title":"Lookup Race Response"}],"url":"https://fetch.spec.whatwg.org/#non-subresource-request"},
+"5a391458": {"dfnID":"5a391458","dfnText":"non-subresource request","external":true,"refSections":[{"refs":[{"id":"ref-for-non-subresource-request"},{"id":"ref-for-non-subresource-request\u2460"},{"id":"ref-for-non-subresource-request\u2461"}],"title":"Handle Fetch"},{"refs":[{"id":"ref-for-non-subresource-request\u2462"},{"id":"ref-for-non-subresource-request\u2463"}],"title":"Create Fetch Event and Dispatch"},{"refs":[{"id":"ref-for-non-subresource-request\u2464"}],"title":"Lookup Race Response"}],"url":"https://fetch.spec.whatwg.org/#non-subresource-request"},
 "5afbefcd": {"dfnID":"5afbefcd","dfnText":"item (for list)","external":true,"refSections":[{"refs":[{"id":"ref-for-list-item"},{"id":"ref-for-list-item\u2460"},{"id":"ref-for-list-item\u2461"}],"title":"2.1. Service Worker"},{"refs":[{"id":"ref-for-list-item\u2462"},{"id":"ref-for-list-item\u2463"}],"title":"2.5.2. The worker client case"},{"refs":[{"id":"ref-for-list-item\u2464"}],"title":"5.4.5. put(request, response)"},{"refs":[{"id":"ref-for-list-item\u2465"}],"title":"5.5.5. keys()"},{"refs":[{"id":"ref-for-list-item\u2466"}],"title":"Appendix A: Algorithms"},{"refs":[{"id":"ref-for-list-item\u2467"}],"title":"Run Job"},{"refs":[{"id":"ref-for-list-item\u2468"}],"title":"Finish Job"},{"refs":[{"id":"ref-for-list-item\u2460\u24ea"}],"title":"Terminate Service Worker"},{"refs":[{"id":"ref-for-list-item\u2460\u2460"},{"id":"ref-for-list-item\u2460\u2461"},{"id":"ref-for-list-item\u2460\u2462"}],"title":"Batch Cache Operations"}],"url":"https://infra.spec.whatwg.org/#list-item"},
 "5c35dd47": {"dfnID":"5c35dd47","dfnText":"sandbox","external":true,"refSections":[{"refs":[{"id":"ref-for-attr-iframe-sandbox"}],"title":"2.5.1. The window client case"}],"url":"https://html.spec.whatwg.org/multipage/iframe-embed-object.html#attr-iframe-sandbox"},
 "5c4f772b": {"dfnID":"5c4f772b","dfnText":"match","external":true,"refSections":[{"refs":[{"id":"ref-for-url-pattern-match"}],"title":"Match Router Condition"}],"url":"https://urlpattern.spec.whatwg.org/#url-pattern-match"},