@quintype/framework 7.34.7-handle-500-issue.2 → 7.34.7-handle-500-issue.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.34.7-handle-500-issue.2",
+  "version": "7.34.7-handle-500-issue.3",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/cdn-caching.js

@@ -42,7 +42,7 @@ exports.addCacheHeadersToResult = function addCacheHeadersToResult({
       } else {
         res.setHeader(
           "Cache-Control",
-          `public,max-age=${maxAge},s-maxage=120,stale-while-revalidate=120,stale-if-error=120`
+          `public,max-age=${maxAge},s-maxage=${sMaxAge},stale-while-revalidate=1000,stale-if-error=${STALE_IF_ERROR_CACHE_DURATION}`
         );
       }
 

package/server/handlers/isomorphic-handler.js

@@ -486,7 +486,6 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
       return res.redirect(301, result.data.location);
     }
 
-    // For server errors (>=500),send statuss
     if (statusCode >= 500) {
       return res.sendStatus(statusCode);
     }

package/test/integration/custom-route-handler-test.js

@@ -121,7 +121,7 @@ describe("Custom Route Handler", function () {
     supertest(app)
       .get("/moved-permanently")
       .expect("Location", "/permanent-location")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", /Accept\-Encoding/)
       .expect("Surrogate-Key", "sp/42/101")
       .expect("Cache-Tag", "sp/42/101")
@@ -136,7 +136,7 @@ describe("Custom Route Handler", function () {
     supertest(app)
       .get("/moved-temporarily")
       .expect("Location", "/temporary-location")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", /Accept\-Encoding/)
       .expect("Surrogate-Key", "sp/42/102")
       .expect("Cache-Tag", "sp/42/102")
@@ -152,7 +152,7 @@ describe("Custom Route Handler", function () {
     supertest(app)
       .get("/static-with-header-footer")
       .expect("Content-Type", /html/)
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", "Accept-Encoding")
       .expect("Surrogate-Key", "sp/42/103")
       .expect("Cache-Tag", "sp/42/103")
@@ -174,7 +174,7 @@ describe("Custom Route Handler", function () {
     supertest(app)
       .get("/static-without-header-footer")
       .expect("Content-Type", /html/)
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", "Accept-Encoding")
       .expect("Surrogate-Key", "sp/42/104")
       .expect("Cache-Tag", "sp/42/104")
@@ -236,7 +236,7 @@ describe("Custom Route Handler", function () {
     supertest(app)
       .get("/moved-absolute")
       .expect("Location", "https://www.google.com")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", /Accept\-Encoding/)
       .expect("Surrogate-Key", "sp/42/105")
       .expect("Cache-Tag", "sp/42/105")
@@ -250,7 +250,7 @@ describe("Custom Route Handler", function () {
     );
     supertest(app)
       .get("/static-with-mime-type")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", /Accept\-Encoding/)
       .expect("Surrogate-Key", "sp/42/105")
       .expect("Cache-Tag", "sp/42/105")
@@ -265,7 +265,7 @@ describe("Custom Route Handler", function () {
     );
     supertest(app)
       .get("/static-without-header-footer")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", "Accept-Encoding")
       .expect("Surrogate-Key", "sp/42/104")
       .expect("Cache-Tag", "sp/42/104")

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

@@ -200,7 +200,7 @@ describe("Isomorphic Handler", function () {
     supertest(app)
       .get("/")
       .expect("Content-Type", /html/)
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", "Accept-Encoding")
       .expect("Surrogate-Key", "foo bar")
       .expect("Cache-Tag", "foo,bar")
@@ -503,7 +503,7 @@ describe("Isomorphic Handler", function () {
         .then((res) => {
           const cacheControl = res.header["cache-control"];
           const cacheTag = res.header["cache-tag"];
-          assert.equal(cacheControl, "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120");
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(cacheTag, "c/1/abcdefgh");
         })
         .then(done);
@@ -631,7 +631,7 @@ describe("Isomorphic Handler", function () {
           const cacheControl = res.header["cache-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
-          assert.equal(cacheControl, "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120");
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,
@@ -670,7 +670,7 @@ describe("Isomorphic Handler", function () {
           const cacheControl = res.header["cache-control"];
           const edgeCacheTag = res.header["edge-cache-tag"];
           const contentSecurityPolicy = res.header["content-security-policy"];
-          assert.equal(cacheControl, "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120");
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
           assert.equal(edgeCacheTag, "c/1/abcdefgh");
           assert.equal(
             contentSecurityPolicy,
@@ -706,7 +706,10 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          assert.equal(cacheControl, "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120");
+          assert.equal(
+            cacheControl,
+            "public,max-age=15,s-maxage=1800,stale-while-revalidate=1000,stale-if-error=14400"
+          );
         })
         .then(done);
     });
@@ -727,7 +730,7 @@ describe("Isomorphic Handler", function () {
         .expect(200)
         .then((res) => {
           const cacheControl = res.header["cache-control"];
-          assert.equal(cacheControl, "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120");
+          assert.equal(cacheControl, "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400");
         })
         .then(done);
     });

package/test/integration/url-redirect-test.js

@@ -619,7 +619,7 @@ describe("Redirect Routes Handler", function () {
     supertest(app)
       .get("/moved-temporarily-1")
       .expect("Location", "/temporarily-location-1")
-      .expect("Cache-Control", "public,max-age=15,s-maxage=120,stale-while-revalidate=120,stale-if-error=120")
+      .expect("Cache-Control", "public,max-age=15,s-maxage=900,stale-while-revalidate=1000,stale-if-error=14400")
       .expect("Vary", /Accept\-Encoding/)
       .expect("Surrogate-Key", "sp/42/102")
       .expect("Cache-Tag", "sp/42/102")