Address PR feedback: use flatMap, dedupe hosts with Set, replaceAll for escaping

Author: davidnuescheler

src/extension/auth.js

@@ -43,45 +43,47 @@ export function getHostDomain(host) {
  */
 export function getCacheControlRules(projectConfigs) {
   const rules = [];
-  projectConfigs
-    .map((p) => [
-      p?.host,
-      p?.previewHost,
-      p?.liveHost,
-      p?.reviewHost,
-    ].filter(Boolean).map(getHostDomain))
-    .flat()
-    .filter(Boolean)
-    .forEach((domain) => {
-      const escaped = domain.replace(/\./g, '\\.');
-      rules.push({
-        id: getRandomId(),
-        priority: 1,
-        action: {
-          type: 'modifyHeaders',
-          responseHeaders: [{
-            header: 'Cache-Control',
-            operation: 'set',
-            value: `max-age=${CACHE_MAX_AGE_SECONDS}`,
-          }],
-        },
-        condition: {
-          regexFilter: `^https://${escaped}/.*`,
-          requestMethods: ['get'],
-          resourceTypes: [
-            'main_frame',
-            'sub_frame',
-            'script',
-            'stylesheet',
-            'image',
-            'xmlhttprequest',
-            'media',
-            'font',
-            'other',
-          ],
-        },
-      });
+  const hosts = [
+    ...new Set(
+      projectConfigs
+        .flatMap((p) => [
+          p?.host,
+          p?.previewHost,
+          p?.liveHost,
+          p?.reviewHost,
+        ].filter(Boolean).map(getHostDomain)),
+    ),
+  ].filter(Boolean);
+  hosts.forEach((domain) => {
+    const escaped = domain.replaceAll(/\./g, '\\.');
+    rules.push({
+      id: getRandomId(),
+      priority: 1,
+      action: {
+        type: 'modifyHeaders',
+        responseHeaders: [{
+          header: 'Cache-Control',
+          operation: 'set',
+          value: `max-age=${CACHE_MAX_AGE_SECONDS}`,
+        }],
+      },
+      condition: {
+        regexFilter: `^https://${escaped}/.*`,
+        requestMethods: ['get'],
+        resourceTypes: [
+          'main_frame',
+          'sub_frame',
+          'script',
+          'stylesheet',
+          'image',
+          'xmlhttprequest',
+          'media',
+          'font',
+          'other',
+        ],
+      },
     });
+  });
   return rules;
 }
 

test/auth.test.js

@@ -89,14 +89,14 @@ describe('Test auth', () => {
       expect(filters).to.include('^https://preview\\.example\\.com/.*');
       expect(filters).to.include('^https://live\\.example\\.com/.*');
     });
-    it('adds one rule per host occurrence (no deduplication)', () => {
+    it('deduplicates same host across configs', () => {
       const configs = [
         { host: 'same.com', previewHost: 'same.com' },
         { liveHost: 'same.com' },
       ];
       const rules = getCacheControlRules(configs);
-      expect(rules).to.have.lengthOf(3);
-      expect(rules.every((r) => r.condition.regexFilter === '^https://same\\.com/.*')).to.be.true;
+      expect(rules).to.have.lengthOf(1);
+      expect(rules[0].condition.regexFilter).to.equal('^https://same\\.com/.*');
     });
     it('extracts host from full URL in config', () => {
       const configs = [{ host: 'https://url-host.com/path' }];