Font cache support

Spomky-Labs · Feb 6, 2024 · b1e3733 · b1e3733
1 parent 58f53d7
commit b1e3733
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 165 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -440,41 +440,6 @@ parameters:
 			count: 1
 			path: src/Normalizer/ScreenshotNormalizer.php
 
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ServiceWorkerNormalizer\\:\\:normalize\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Normalizer/ServiceWorkerNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ServiceWorkerNormalizer\\:\\:normalize\\(\\) should return array\\{scope\\?\\: string, src\\: string, use_cache\\?\\: bool\\} but returns array\\<mixed\\>\\.$#"
-			count: 1
-			path: src/Normalizer/ServiceWorkerNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ServiceWorkerNormalizer\\:\\:supportsNormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Normalizer/ServiceWorkerNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ShortcutNormalizer\\:\\:normalize\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Normalizer/ShortcutNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ShortcutNormalizer\\:\\:normalize\\(\\) return type has no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Normalizer/ShortcutNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ShortcutNormalizer\\:\\:normalize\\(\\) should return array\\{description\\?\\: string, icons\\?\\: array, name\\: string, short_name\\?\\: string, url\\: string\\} but returns array\\<mixed\\>\\.$#"
-			count: 1
-			path: src/Normalizer/ShortcutNormalizer.php
-
-		-
-			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\ShortcutNormalizer\\:\\:supportsNormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
-			count: 1
-			path: src/Normalizer/ShortcutNormalizer.php
-
 		-
 			message: "#^Method SpomkyLabs\\\\PwaBundle\\\\Normalizer\\\\UrlNormalizer\\:\\:normalize\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -155,6 +155,21 @@ private function setupServiceWorker(ArrayNodeDefinition $node): void
                                 ->info('The maximum number of entries in the image cache.')
                                 ->example([50, 100, 200])
                             ->end()
+                            ->integerNode('max_image_age')
+                                ->defaultValue(60 * 60 * 24 * 365)
+                                ->info('The maximum number of seconds before the image cache is invalidated.')
+                                ->example([60 * 60 * 24 * 365, 60 * 60 * 24 * 30, 60 * 60 * 24 * 7])
+                            ->end()
+                            ->integerNode('max_font_cache_entries')
+                                ->defaultValue(30)
+                                ->info('The maximum number of entries in the font cache.')
+                                ->example([30, 50, 100])
+                            ->end()
+                            ->integerNode('max_font_age')
+                                ->defaultValue(60 * 60 * 24 * 365)
+                                ->info('The maximum number of seconds before the font cache is invalidated.')
+                                ->example([60 * 60 * 24 * 365, 60 * 60 * 24 * 30, 60 * 60 * 24 * 7])
+                            ->end()
                             ->integerNode('network_timeout_seconds')
                                 ->defaultValue(3)
                                 ->info(

diff --git a/src/Dto/Workbox.php b/src/Dto/Workbox.php
@@ -48,6 +48,15 @@ final class Workbox
     #[SerializedName('network_timeout_seconds')]
     public int $networkTimeoutSeconds = 3;
 
+    #[SerializedName('max_font_age')]
+    public int $maxFontAge = 60 * 60 * 24 * 365;
+
+    #[SerializedName('max_font_cache_entries')]
+    public int $maxFontCacheEntries = 60;
+
+    #[SerializedName('max_image_age')]
+    public int $maxImageAge = 60 * 60 * 24 * 365;
+
     #[SerializedName('max_image_cache_entries')]
     public int $maxImageCacheEntries = 60;
 

diff --git a/src/Normalizer/AssetNormalizer.php b/src/Normalizer/AssetNormalizer.php
@@ -25,7 +25,6 @@ public function normalize(mixed $object, string $format = null, array $context =
     {
         assert($object instanceof Asset);
         $url = null;
-        dump($object);
         if (! str_starts_with($object->src, '/')) {
             $asset = $this->assetMapper->getAsset($object->src);
             $url = $asset?->publicPath;

diff --git a/src/Normalizer/IconNormalizer.php b/src/Normalizer/IconNormalizer.php
@@ -8,13 +8,17 @@
 use Symfony\Component\AssetMapper\AssetMapperInterface;
 use Symfony\Component\AssetMapper\MappedAsset;
 use Symfony\Component\Mime\MimeTypes;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use function assert;
 
-final readonly class IconNormalizer implements NormalizerInterface
+final class IconNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
+    use NormalizerAwareTrait;
+
     public function __construct(
-        private AssetMapperInterface $assetMapper,
+        private readonly AssetMapperInterface $assetMapper,
     ) {
     }
 
@@ -24,16 +28,16 @@ public function __construct(
     public function normalize(mixed $object, string $format = null, array $context = []): array
     {
         assert($object instanceof Icon);
-        $format = null;
+        $imageFormat = null;
         if (! str_starts_with($object->src->src, '/')) {
             $asset = $this->assetMapper->getAsset($object->src->src);
-            $format = $this->getFormat($object, $asset);
+            $imageFormat = $this->getFormat($object, $asset);
         }
 
         $result = [
-            'src' => $object->src,
+            'src' => $this->normalizer->normalize($object->src, $format, $context),
             'sizes' => $object->getSizeList(),
-            'type' => $format,
+            'type' => $imageFormat,
             'purpose' => $object->purpose,
         ];
 

diff --git a/src/Normalizer/ScreenshotNormalizer.php b/src/Normalizer/ScreenshotNormalizer.php
@@ -9,14 +9,18 @@
 use Symfony\Component\AssetMapper\AssetMapperInterface;
 use Symfony\Component\AssetMapper\MappedAsset;
 use Symfony\Component\Mime\MimeTypes;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use function assert;
 
-final readonly class ScreenshotNormalizer implements NormalizerInterface
+final class ScreenshotNormalizer implements NormalizerInterface, NormalizerAwareInterface
 {
+    use NormalizerAwareTrait;
+
     public function __construct(
-        private AssetMapperInterface $assetMapper,
-        private null|ImageProcessor $imageProcessor,
+        private readonly AssetMapperInterface $assetMapper,
+        private readonly null|ImageProcessor $imageProcessor,
     ) {
     }
 
@@ -28,23 +32,24 @@ public function normalize(mixed $object, string $format = null, array $context =
         assert($object instanceof Screenshot);
         $url = null;
         $asset = null;
+        $imageFormat = null;
         if (! str_starts_with($object->src->src, '/')) {
             $asset = $this->assetMapper->getAsset($object->src->src);
             $url = $asset?->publicPath;
-            $format = $this->getFormat($object, $asset);
+            $imageFormat = $this->getFormat($object, $asset);
         }
         if ($url === null) {
             $url = $object->src->src;
         }
         ['sizes' => $sizes, 'formFactor' => $formFactor] = $this->getSizes($object, $asset);
 
         $result = [
-            'src' => $url,
+            'src' => $this->normalizer->normalize($object->src, $format, $context),
             'sizes' => $sizes,
             'form_factor' => $formFactor,
             'label' => $object->label,
             'platform' => $object->platform,
-            'format' => $format,
+            'format' => $imageFormat,
         ];
 
         $cleanup = static fn (array $data): array => array_filter(

diff --git a/src/Normalizer/ServiceWorkerNormalizer.php b/src/Normalizer/ServiceWorkerNormalizer.php
diff --git a/src/Normalizer/ShortcutNormalizer.php b/src/Normalizer/ShortcutNormalizer.php
diff --git a/src/Service/ServiceWorkerCompiler.php b/src/Service/ServiceWorkerCompiler.php
@@ -70,19 +70,19 @@ private function processStandardRules(Workbox $workbox, string $body): string
         }
 
         $images = [];
-        $static = [];
+        $statics = [];
         foreach ($this->assetMapper->allAssets() as $asset) {
             if (preg_match($workbox->imageRegex, $asset->sourcePath) === 1) {
                 $images[] = $asset->publicPath;
             } elseif (preg_match($workbox->staticRegex, $asset->sourcePath) === 1) {
-                $static[] = $asset->publicPath;
+                $statics[] = $asset->publicPath;
             }
         }
         $jsonOptions = [
             JsonEncode::OPTIONS => JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR,
         ];
         $imageUrls = $this->serializer->serialize($images, 'json', $jsonOptions);
-        $staticUrls = $this->serializer->serialize($static, 'json', $jsonOptions);
+        $staticUrls = $this->serializer->serialize($statics, 'json', $jsonOptions);
         $routes = $this->serializer->serialize($workbox->warmCacheUrls, 'json', $jsonOptions);
 
         $declaration = <<<STANDARD_RULE_STRATEGY
@@ -94,12 +94,28 @@ private function processStandardRules(Workbox $workbox, string $body): string
 workbox.recipes.imageCache({
     cacheName: 'images',
     maxEntries: {$workbox->maxImageCacheEntries},
+    maxImageAge: {$workbox->maxImageAge},
     warmCache: {$imageUrls}
 });
 workbox.recipes.staticResourceCache({
     cacheName: 'assets',
     warmCache: {$staticUrls}
 });
+workbox.routing.registerRoute(
+  ({request}) => request.destination === 'font',
+  new workbox.strategies.CacheFirst({
+    cacheName: 'fonts',
+    plugins: [
+      new workbox.cacheableResponse.CacheableResponsePlugin({
+        statuses: [0, 200],
+      }),
+      new workbox.expiration.ExpirationPlugin({
+        maxAgeSeconds: {$workbox->maxFontAge},
+        maxEntries: {$workbox->maxFontCacheEntries},
+      }),
+    ],
+  })
+);
 STANDARD_RULE_STRATEGY;
 
         return str_replace($workbox->standardRulesPlaceholder, trim($declaration), $body);
@@ -138,7 +154,7 @@ private function processOfflineFallback(Workbox $workbox, string $body): string
 workbox.recipes.offlineFallback({
     pageFallback: {$pageFallback},
     imageFallback: {$imageFallback},
-    pageFallback: {$fontFallback}
+    fontFallback: {$fontFallback}
 });
 OFFLINE_FALLBACK_STRATEGY;