Allow multiple page cache

Spomky-Labs · Mar 9, 2024 · 0f74e43 · 0f74e43
1 parent 1337b75
commit 0f74e43
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 83 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -492,7 +492,7 @@ parameters:
 
 		-
 			message: "#^Anonymous function should return array but returns mixed\\.$#"
-			count: 10
+			count: 6
 			path: src/Resources/config/definition/service_worker.php
 
 		-
@@ -520,11 +520,6 @@ parameters:
 			count: 1
 			path: src/Resources/config/definition/service_worker.php
 
-		-
-			message: "#^Cannot access offset 'font_fallback' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
 		-
 			message: "#^Cannot access offset 'font_regex' on mixed\\.$#"
 			count: 1
@@ -540,11 +535,6 @@ parameters:
 			count: 1
 			path: src/Resources/config/definition/service_worker.php
 
-		-
-			message: "#^Cannot access offset 'image_fallback' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
 		-
 			message: "#^Cannot access offset 'image_regex' on mixed\\.$#"
 			count: 1
@@ -570,44 +560,14 @@ parameters:
 			count: 1
 			path: src/Resources/config/definition/service_worker.php
 
-		-
-			message: "#^Cannot access offset 'network_timeout…' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
-		-
-			message: "#^Cannot access offset 'offline_fallback' on mixed\\.$#"
-			count: 2
-			path: src/Resources/config/definition/service_worker.php
-
-		-
-			message: "#^Cannot access offset 'page_cache_name' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
-		-
-			message: "#^Cannot access offset 'page_caches' on mixed\\.$#"
-			count: 2
-			path: src/Resources/config/definition/service_worker.php
-
-		-
-			message: "#^Cannot access offset 'page_fallback' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
 		-
 			message: "#^Cannot access offset 'static_regex' on mixed\\.$#"
 			count: 1
 			path: src/Resources/config/definition/service_worker.php
 
-		-
-			message: "#^Cannot access offset 'warm_cache_urls' on mixed\\.$#"
-			count: 1
-			path: src/Resources/config/definition/service_worker.php
-
 		-
 			message: "#^Strict comparison using \\!\\=\\= between mixed and null will always evaluate to true\\.$#"
-			count: 4
+			count: 3
 			path: src/Resources/config/definition/service_worker.php
 
 		-
@@ -675,6 +635,11 @@ parameters:
 			count: 1
 			path: src/Service/Rule/GoogleFontCache.php
 
+		-
+			message: "#^Strict comparison using \\=\\=\\= between int\\<1, max\\> and 0 will always evaluate to false\\.$#"
+			count: 1
+			path: src/Service/Rule/OfflineFallback.php
+
 		-
 			message: "#^Parameter \\#6 \\$options of static method SpomkyLabs\\\\PwaBundle\\\\Service\\\\CacheStrategy\\:\\:create\\(\\) expects array\\{maxTimeout\\?\\: int, maxAge\\?\\: int, maxEntries\\?\\: int, warmUrls\\?\\: array\\<string\\>, plugins\\?\\: array\\<string\\>\\}, array\\{maxTimeout\\: int, plugins\\: array\\{0\\: 'CacheableResponsePl…', 1\\?\\: 'BroadcastUpdatePlug…'\\}, warmUrls\\: mixed\\} given\\.$#"
 			count: 1

diff --git a/src/Dto/OfflineFallback.php b/src/Dto/OfflineFallback.php
@@ -8,8 +8,6 @@
 
 final class OfflineFallback
 {
-    public bool $enabled = true;
-
     #[SerializedName('page')]
     public null|Url $pageFallback = null;
 

diff --git a/src/Resources/config/definition/service_worker.php b/src/Resources/config/definition/service_worker.php
@@ -94,38 +94,6 @@
                             return $v;
                         })
                     ->end()
-                    ->beforeNormalization()
-                        ->ifTrue(static fn (mixed $v): bool => true)
-                        ->then(static function (mixed $v): array {
-                            if (isset($v['page_caches'])) {
-                                return $v;
-                            }
-                            $v['page_caches'] = [];
-                            $v['page_caches'][] = array_filter([
-                                'cache_name' => $v['page_cache_name'] ?? 'pages',
-                                'network_timeout' => $v['network_timeout_seconds'] ?? 3,
-                                'urls' => $v['warm_cache_urls'] ?? [],
-                            ], static fn (mixed $v): bool => $v !== null);
-
-                            return $v;
-                        })
-                    ->end()
-                    ->beforeNormalization()
-                        ->ifTrue(static fn (mixed $v): bool => true)
-                        ->then(static function (mixed $v): array {
-                            if (isset($v['offline_fallback'])) {
-                                return $v;
-                            }
-                            $v['offline_fallback'] = array_filter([
-                                'enabled' => true,
-                                'page' => $v['page_fallback'] ?? null,
-                                'image' => $v['image_fallback'] ?? null,
-                                'font' => $v['font_fallback'] ?? null,
-                            ], static fn (mixed $v): bool => $v !== null);
-
-                            return $v;
-                        })
-                    ->end()
                     ->children()
                         ->booleanNode('use_cdn')
                             ->defaultFalse()
@@ -207,7 +175,9 @@
                             ->info('Whether to clear the cache during the service worker activation.')
                         ->end()
                         ->arrayNode('offline_fallback')
-                            ->canBeDisabled()
+                            ->treatNullLike([])
+                            ->treatFalseLike([])
+                            ->treatTrueLike([])
                             ->children()
                                 ->append(getUrlNode('page', 'The URL of the offline page fallback.'))
                                 ->append(getUrlNode('image', 'The URL of the offline image fallback.'))

diff --git a/src/Service/Rule/AssetCache.php b/src/Service/Rule/AssetCache.php
@@ -67,7 +67,7 @@ public function process(string $body): string
         $assetUrlsLength = count($assets) * 2;
 
         $declaration = <<<ASSET_CACHE_RULE_STRATEGY
-const assetCacheStrategy = new workbox.strategies.CacheOnly({
+const assetCacheStrategy = new workbox.strategies.CacheFirst({
   cacheName: '{$this->workbox->assetCache->cacheName}',
   plugins: [
     new workbox.cacheableResponse.CacheableResponsePlugin({statuses: [0, 200]}),
@@ -103,7 +103,7 @@ public function getCacheStrategies(): array
         return [
             CacheStrategy::create(
                 $this->workbox->assetCache->cacheName,
-                CacheStrategy::STRATEGY_CACHE_ONLY,
+                CacheStrategy::STRATEGY_CACHE_FIRST,
                 sprintf("'({url}) => url.pathname.startsWith('%s')'", $this->assetPublicPrefix),
                 $this->workbox->enabled && $this->workbox->assetCache->enabled,
                 true,

diff --git a/src/Service/Rule/OfflineFallback.php b/src/Service/Rule/OfflineFallback.php
@@ -46,10 +46,7 @@ public function __construct(
 
     public function process(string $body): string
     {
-        if ($this->workbox->enabled === false) {
-            return $body;
-        }
-        if ($this->workbox->offlineFallback->enabled === false) {
+        if ($this->workbox->enabled === false || ! isset($this->workbox->offlineFallback)) {
             return $body;
         }
         $options = [
@@ -58,6 +55,9 @@ public function process(string $body): string
             'fontFallback' => $this->workbox->offlineFallback->fontFallback,
         ];
         $options = array_filter($options, static fn (mixed $v): bool => $v !== null);
+        if (count($options) === 0) {
+            return $body;
+        }
         $options = count($options) === 0 ? '' : $this->serializer->serialize($options, 'json', $this->jsonOptions);
 
         $declaration = <<<OFFLINE_FALLBACK_STRATEGY