@quintype/framework 7.23.2-update-cache-headers.1 → 7.23.2-update-cache-headers.2

package/constants.js

@@ -0,0 +1 @@
+export const STALE_IF_ERROR_CACHE_DURATION = 14400;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.23.2-update-cache-headers.1",
+  "version": "7.23.2-update-cache-headers.2",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/cdn-caching.js

@@ -1,5 +1,6 @@
 const { cache } = require("ejs");
 const _ = require("lodash");
+const { STALE_IF_ERROR_CACHE_DURATION } = require("../../constants");
 
 exports.addCacheHeadersToResult = function addCacheHeadersToResult({
   res,
@@ -16,7 +17,6 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
   if (cacheKeys) {
     if (cacheKeys === "DO_NOT_CACHE") {
       res.setHeader("Cache-Control", "private,no-cache,no-store,max-age=0");
-      cdnProviderVal === "akamai" && res.setHeader("Edge-Control", "private,no-cache,no-store,max-age=0");
       res.setHeader("Vary", "Accept-Encoding");
       res.setHeader(
         "Content-Security-Policy",
@@ -34,19 +34,16 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
       );
     } else {
       if (networkOnly) {
-        res.setHeader("Cache-Control", `public,s-maxage=${sMaxAge},stale-if-error=14400`);
+        res.setHeader("Cache-Control", `public,s-maxage=${sMaxAge},stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`);
         res.setHeader(
           "Cloudflare-CDN-Cache-Control",
-          `max-age=${sMaxAge},stale-if-error=14400`
+          `max-age=${sMaxAge}, stale-while-revalidate=1000, stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`
         );
-        cdnProviderVal === "akamai" && res.setHeader("Edge-Control", `public,maxage=${sMaxAge}`);
       } else {
         res.setHeader(
           "Cache-Control",
-          `public,max-age=${maxAge},s-maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=14400`
+          `public,max-age=${maxAge},s-maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`
         );
-        cdnProviderVal === "akamai" &&
-          res.setHeader("Edge-Control", `public,maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=14400`);
       }
 
       res.setHeader("Vary", "Accept-Encoding");
@@ -75,8 +72,6 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
     }
   } else {
     res.setHeader("Cache-Control", "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600");
-    cdnProviderVal === "akamai" &&
-      res.setHeader("Edge-Control", "public,maxage=60,stale-while-revalidate=150,stale-if-error=3600");
     res.setHeader("Vary", "Accept-Encoding");
     res.setHeader(
       "Content-Security-Policy",

package/server/handlers/generate-service-worker.js

@@ -1,3 +1,5 @@
+const { STALE_IF_ERROR_CACHE_DURATION } = require("../../constants");
+
 async function generateServiceWorker(
   req,
   res,
@@ -39,7 +41,7 @@ async function generateServiceWorker(
           res
             .status(200)
             .header("Content-Type", "application/javascript")
-            .header("Cache-Control", "public,max-age=300, stale-while-revalidate=1000, stale-if-error=14400")
+            .header("Cache-Control", `public,max-age=300, stale-while-revalidate=1000, stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`)
             .header("Vary", "Accept-Encoding")
             .header(
               "Cache-Tag",

package/server/handlers/json-manifest-handlers.js

@@ -1,5 +1,6 @@
 const get = require("lodash/get");
 const Promise = require("bluebird");
+const { STALE_IF_ERROR_CACHE_DURATION } = require("../../constants");
 
 exports.handleManifest = function handleManifest(
   req,
@@ -9,7 +10,7 @@ exports.handleManifest = function handleManifest(
 ) {
   return new Promise((resolve) => resolve(manifestFn(config, domainSlug)))
     .then((result) => {
-      res.setHeader("Cache-Control", "public,max-age=900,stale-while-revalidate=1000, stale-if-error=14400");
+      res.setHeader("Cache-Control", `public,max-age=900,stale-while-revalidate=1000, stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`);
       res.setHeader("Vary", "Accept-Encoding");
       res.json(
         Object.assign(

package/test/integration/isomorphic-data-load-test.js

@@ -7,6 +7,7 @@ const supertest = require("supertest");
 const {
   MOCK_WHITELIST_MOBILE_CONFIG,
 } = require("../data/whitelist-mobile-config");
+const { STALE_IF_ERROR_CACHE_DURATION } = require("../../constants");
 
 function getClientStub() {
   return {
@@ -158,7 +159,7 @@ describe("Isomorphic Data Load", function () {
       .expect("Content-Type", /json/)
       .expect(
         "Cache-Control",
-        "public,s-maxage=900,stale-if-error=14400",
+        `public,s-maxage=900,stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`,
       )
       .expect("Vary", "Accept-Encoding")
       .expect("Cache-Tag", "foo,bar")

package/test/integration/isomorphic-handler-test.js

@@ -559,12 +559,10 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          const edgeCacheControl = res.header["edge-control"];
           const cacheTag = res.header["cache-tag"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
           assert.equal(cacheControl, "private,no-cache,no-store,max-age=0");
-          assert.equal(edgeCacheControl, "private,no-cache,no-store,max-age=0");
           assert.equal(cacheTag, undefined);
           assert.equal(edgeCacheTag, undefined);
           assert.equal(
@@ -602,11 +600,9 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
           assert.equal(cacheControl, "public,max-age=15,s-maxage=60,stale-while-revalidate=150,stale-if-error=3600");
-          assert.equal(edgeCacheControl, "public,maxage=60,stale-while-revalidate=150,stale-if-error=3600");
           assert.equal(edgeCacheTag, undefined);
           assert.equal(
             contentSecurityPolicy,
@@ -643,11 +639,9 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
           assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
-          assert.equal(edgeCacheControl, "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,
@@ -684,11 +678,9 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          const edgeCacheControl = res.header["edge-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
           assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
-          assert.equal(edgeCacheControl, "public,maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,