Changeset 275751 in webkit

Timestamp:

Apr 9, 2021 1:54:34 AM (16 months ago)

Author:

ysuzuki@apple.com

Message:

ServiceWorker should save module scripts
​https://bugs.webkit.org/show_bug.cgi?id=224356
<rdar://problem/75634897>

Reviewed by Youenn Fablet.

Source/WebCore:

Test: http/wpt/service-workers/persistent-modules.html

In this patch, we call setScriptResource / scriptResource while loading service-worker module scripts in module loaders,
so that we can ensure that they are saved on the disk.

• bindings/js/ScriptModuleLoader.cpp:

(WebCore::ScriptModuleLoader::notifyFinished):

• bindings/js/WorkerModuleScriptLoader.cpp:

(WebCore::WorkerModuleScriptLoader::load):
(WebCore::WorkerModuleScriptLoader::notifyFinished):
(WebCore::WorkerModuleScriptLoader::notifyClientFinished):

• bindings/js/WorkerModuleScriptLoader.h:

LayoutTests:

• http/wpt/service-workers/persistent-modules-expected.txt: Added.
• http/wpt/service-workers/persistent-modules.html: Added.
• http/wpt/service-workers/resources/persistent-imported-module-script.py: Added.

(main):

• http/wpt/service-workers/resources/persistent-module-worker.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/service-workers/persistent-modules-expected.txt (added)
• LayoutTests/http/wpt/service-workers/persistent-modules.html (added)
• LayoutTests/http/wpt/service-workers/resources/persistent-imported-module-script.py (added)
• LayoutTests/http/wpt/service-workers/resources/persistent-module-worker.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptModuleLoader.cpp (modified) (4 diffs)
• Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/WorkerModuleScriptLoader.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-09  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        ServiceWorker should save module scripts
+        https://bugs.webkit.org/show_bug.cgi?id=224356
+        <rdar://problem/75634897>
+
+        Reviewed by Youenn Fablet.
+
+        * http/wpt/service-workers/persistent-modules-expected.txt: Added.
+        * http/wpt/service-workers/persistent-modules.html: Added.
+        * http/wpt/service-workers/resources/persistent-imported-module-script.py: Added.
+        (main):
+        * http/wpt/service-workers/resources/persistent-module-worker.js: Added.
+
 2021-04-08  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-09  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        ServiceWorker should save module scripts
+        https://bugs.webkit.org/show_bug.cgi?id=224356
+        <rdar://problem/75634897>
+
+        Reviewed by Youenn Fablet.
+
+        Test: http/wpt/service-workers/persistent-modules.html
+
+        In this patch, we call setScriptResource / scriptResource while loading service-worker module scripts in module loaders,
+        so that we can ensure that they are saved on the disk.
+
+        * bindings/js/ScriptModuleLoader.cpp:
+        (WebCore::ScriptModuleLoader::notifyFinished):
+        * bindings/js/WorkerModuleScriptLoader.cpp:
+        (WebCore::WorkerModuleScriptLoader::load):
+        (WebCore::WorkerModuleScriptLoader::notifyFinished):
+        (WebCore::WorkerModuleScriptLoader::notifyClientFinished):
+        * bindings/js/WorkerModuleScriptLoader.h:
+
 2021-04-08  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/bindings/js/ScriptModuleLoader.cpp

@@ -370 +370 @@
                 responseURL.setFragmentIdentifier(sourceURL.fragmentIdentifier());
         }
-
-        m_requestURLToResponseURLMap.add(sourceURL.string(), responseURL);
         return responseURL;
     };
@@ -409 +407 @@
         }
 
-        canonicalizeAndRegisterResponseURL(cachedScript.response().url(), cachedScript.hasRedirections(), cachedScript.response().source());
+        URL responseURL = canonicalizeAndRegisterResponseURL(cachedScript.response().url(), cachedScript.hasRedirections(), cachedScript.response().source());
+        m_requestURLToResponseURLMap.add(sourceURL.string(), WTFMove(responseURL));
         promise->resolveWithCallback([&] (JSDOMGlobalObject& jsGlobalObject) {
             return JSC::JSSourceCode::create(jsGlobalObject.vm(),
@@ -416 +415 @@
     } else {
         auto& loader = static_cast<WorkerModuleScriptLoader&>(moduleScriptLoader);
-        auto& workerScriptLoader = loader.scriptLoader();
-
-        if (workerScriptLoader.failed()) {
+
+        if (loader.failed()) {
+            ASSERT(!loader.retrievedFromServiceWorkerCache());
+            auto& workerScriptLoader = loader.scriptLoader();
+            ASSERT(workerScriptLoader.failed());
             if (workerScriptLoader.error().isAccessControl()) {
                 rejectToPropagateNetworkError(promise.get(), ModuleFetchFailureKind::WasErrored, "Cross-origin script load denied by Cross-Origin Resource Sharing policy."_s);
@@ -433 +434 @@
         }
 
-        if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(workerScriptLoader.responseMIMEType())) {
+        if (!MIMETypeRegistry::isSupportedJavaScriptMIMEType(loader.responseMIMEType())) {
             // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-single-module-script
             // The result of extracting a MIME type from response's header list (ignoring parameters) is not a JavaScript MIME type.
             // For historical reasons, fetching a classic script does not include MIME type checking. In contrast, module scripts will fail to load if they are not of a correct MIME type.
-            promise->reject(TypeError, makeString("'", workerScriptLoader.responseMIMEType(), "' is not a valid JavaScript MIME type."));
-            return;
-        }
-
-        if (auto* parameters = loader.parameters()) {
-            // If this is top-level-module, then we extract referrer-policy and apply to the dependent modules.
-            if (parameters->isTopLevelModule())
-                static_cast<WorkerScriptFetcher&>(loader.scriptFetcher()).setReferrerPolicy(loader.referrerPolicy());
-        }
-
-        URL responseURL = canonicalizeAndRegisterResponseURL(workerScriptLoader.responseURL(), workerScriptLoader.isRedirected(), workerScriptLoader.responseSource());
+            promise->reject(TypeError, makeString("'", loader.responseMIMEType(), "' is not a valid JavaScript MIME type."));
+            return;
+        }
+
+        URL responseURL = loader.responseURL();
+        if (!loader.retrievedFromServiceWorkerCache()) {
+            auto& workerScriptLoader = loader.scriptLoader();
+            if (auto* parameters = loader.parameters()) {
+                // If this is top-level-module, then we extract referrer-policy and apply to the dependent modules.
+                if (parameters->isTopLevelModule())
+                    static_cast<WorkerScriptFetcher&>(loader.scriptFetcher()).setReferrerPolicy(loader.referrerPolicy());
+            }
+            responseURL = canonicalizeAndRegisterResponseURL(responseURL, workerScriptLoader.isRedirected(), workerScriptLoader.responseSource());
+#if ENABLE(SERVICE_WORKER)
+            if (is<ServiceWorkerGlobalScope>(m_context))
+                downcast<ServiceWorkerGlobalScope>(m_context).setScriptResource(sourceURL, ServiceWorkerContextData::ImportedScript { loader.script(), responseURL, loader.responseMIMEType() });
+#endif
+        }
+        m_requestURLToResponseURLMap.add(sourceURL.string(), responseURL);
         promise->resolveWithCallback([&] (JSDOMGlobalObject& jsGlobalObject) {
             return JSC::JSSourceCode::create(jsGlobalObject.vm(),
-                JSC::SourceCode { ScriptSourceCode { workerScriptLoader.script(), WTFMove(responseURL), { }, JSC::SourceProviderSourceType::Module, loader.scriptFetcher() }.jsSourceCode() });
+                JSC::SourceCode { ScriptSourceCode { loader.script(), WTFMove(responseURL), { }, JSC::SourceProviderSourceType::Module, loader.scriptFetcher() }.jsSourceCode() });
         });
     }

trunk/Source/WebCore/bindings/js/WorkerModuleScriptLoader.cpp

@@ -62 +62 @@
     m_sourceURL = WTFMove(sourceURL);
 
+#if ENABLE(SERVICE_WORKER)
+    if (is<ServiceWorkerGlobalScope>(context)) {
+        if (auto* scriptResource = downcast<ServiceWorkerGlobalScope>(context).scriptResource(m_sourceURL)) {
+            m_script = scriptResource->script;
+            m_responseURL = scriptResource->responseURL;
+            m_responseMIMEType = scriptResource->mimeType;
+            m_retrievedFromServiceWorkerCache = true;
+            notifyClientFinished();
+            return true;
+        }
+    }
+#endif
+
     ResourceRequest request { m_sourceURL };
 
@@ -95 +108 @@
     ASSERT(m_promise);
 
+    if (m_scriptLoader->failed())
+        m_failed = true;
+    else {
+        m_script = m_scriptLoader->script();
+        m_responseURL = m_scriptLoader->responseURL();
+        m_responseMIMEType = m_scriptLoader->responseMIMEType();
+    }
+
+    notifyClientFinished();
+}
+
+void WorkerModuleScriptLoader::notifyClientFinished()
+{
     auto protectedThis = makeRef(*this);
+
     if (m_client)
         m_client->notifyFinished(*this, WTFMove(m_sourceURL), m_promise.releaseNonNull());

trunk/Source/WebCore/bindings/js/WorkerModuleScriptLoader.h

@@ -27 +27 @@
 
 #include "ModuleScriptLoader.h"
+#include "ScriptBuffer.h"
 #include "WorkerScriptFetcher.h"
 #include "WorkerScriptLoaderClient.h"
@@ -55 +56 @@
     static String taskMode();
     ReferrerPolicy referrerPolicy();
+    bool failed() const { return m_failed; }
+    bool retrievedFromServiceWorkerCache() const { return m_retrievedFromServiceWorkerCache; }
+
+    const ScriptBuffer& script() { return m_script; }
+    const URL& responseURL() const { return m_responseURL; }
+    const String& responseMIMEType() const { return m_responseMIMEType; }
 
 private:
@@ -62 +69 @@
     void notifyFinished() final;
 
+    void notifyClientFinished();
+
     Ref<WorkerScriptLoader> m_scriptLoader;
     URL m_sourceURL;
+    ScriptBuffer m_script;
+    URL m_responseURL;
+    String m_responseMIMEType;
+    bool m_failed { false };
+    bool m_retrievedFromServiceWorkerCache { false };
 };