fix(service-worker): throw a critical error when handleFetch fail (#51989)

JeanMeche · alxhub · commit 9fe08968b84b · 2023-10-04T08:59:28.000-07:00
This commit is a backport to 15.2 of #51960 and #50378 Throwing `SwCriticalError` allows the driver to fallback to `safeFetch` and ensure responseWith doesn't fail. Fixes #50378 PR Close #51989
diff --git a/packages/service-worker/worker/src/assets.ts b/packages/service-worker/worker/src/assets.ts
@@ -128,7 +128,17 @@ export abstract class AssetGroup {
 
       // Look for a cached response. If one exists, it can be used to resolve the fetch
       // operation.
-      const cachedResponse = await cache.match(req, this.config.cacheQueryOptions);
+      let cachedResponse: Response|undefined;
+      try {
+        // Safari 16.4/17 is known to sometimes throw an unexpected internal error on cache access
+        // This try/catch is here as a workaround to prevent a failure of the handleFetch
+        // as the Driver falls back to safeFetch on critical errors.
+        // See #50378
+        cachedResponse = await cache.match(req, this.config.cacheQueryOptions);
+      } catch (error) {
+        throw new SwCriticalError(`Cache is throwing while looking for a match: ${error}`);
+      }
+
       if (cachedResponse !== undefined) {
         // A response has already been cached (which presumably matches the hash for this
         // resource). Check whether it's safe to serve this resource from cache.
@@ -529,8 +539,19 @@ export class PrefetchAssetGroup extends AssetGroup {
       // Construct the Request for this url.
       const req = this.adapter.newRequest(url);
 
-      // First, check the cache to see if there is already a copy of this resource.
-      const alreadyCached = (await cache.match(req, this.config.cacheQueryOptions)) !== undefined;
+      let alreadyCached = false;
+      try {
+        // Safari 16.4/17 is known to sometimes throw an unexpected internal error on cache access
+        // This try/catch is here as a workaround to prevent a failure of the handleFetch
+        // as the Driver falls back to safeFetch on critical errors.
+        // See #50378
+
+        // First, check the cache to see if there is already a copy of this resource.
+        alreadyCached = (await cache.match(req, this.config.cacheQueryOptions)) !== undefined;
+      } catch (error) {
+        throw new SwCriticalError(
+            `Cache is throwing while looking for a match in a PrefetchAssetGroup: ${error}`);
+      }
 
       // If the resource is in the cache already, it can be skipped.
       if (alreadyCached) {
@@ -607,8 +628,19 @@ export class LazyAssetGroup extends AssetGroup {
       // Construct the Request for this url.
       const req = this.adapter.newRequest(url);
 
-      // First, check the cache to see if there is already a copy of this resource.
-      const alreadyCached = (await cache.match(req, this.config.cacheQueryOptions)) !== undefined;
+      let alreadyCached = false;
+      try {
+        // Safari 16.4/17 is known to sometimes throw an unexpected internal error on cache access
+        // This try/catch is here as a workaround to prevent a failure of the handleFetch
+        // as the Driver falls back to safeFetch on critical errors.
+        // See #50378
+
+        // First, check the cache to see if there is already a copy of this resource.
+        alreadyCached = (await cache.match(req, this.config.cacheQueryOptions)) !== undefined;
+      } catch (error) {
+        throw new SwCriticalError(
+            `Cache is throwing while looking for a match in a LazyAssetGroup: ${error}`);
+      }
 
       // If the resource is in the cache already, it can be skipped.
       if (alreadyCached) {
