@quintype/framework 7.28.4-image-below-fold.2 → 7.29.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [7.29.0](https://github.com/quintype/quintype-node-framework/compare/v7.28.3...v7.29.0) (2024-07-15)
+
+
+### Features
+
+* Add support for 410 Gone URL  ([#431](https://github.com/quintype/quintype-node-framework/issues/431)) ([8820a42](https://github.com/quintype/quintype-node-framework/commit/8820a42a51f0a22f598d4562c0b2a154fce8931a))
+
 ### [7.28.3](https://github.com/quintype/quintype-node-framework/compare/v7.28.2...v7.28.3) (2024-06-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.28.4-image-below-fold.2",
+  "version": "7.29.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/isomorphic-handler.js

@@ -192,7 +192,6 @@ exports.handleIsomorphicShell = async function handleIsomorphicShell(
 };
 
 function createStoreFromResult(url, result, opts = {}) {
-  const isBotRequest = _.get(url, "query.botrequest", false);
   const qt = {
     pageType: result.pageType || opts.defaultPageType,
     subPageType: result.subPageType,
@@ -200,8 +199,6 @@ function createStoreFromResult(url, result, opts = {}) {
     currentPath: `${url.pathname}${url.search || ""}`,
     currentHostUrl: result.currentHostUrl,
     primaryHostUrl: result.primaryHostUrl,
-    isBotRequest: isBotRequest,
-    belowFoldImgMargin: opts.belowFoldImgMargin,
   };
   return createBasicStore(result, qt, opts);
 }
@@ -464,7 +461,6 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
     ampPageBasePath,
     externalIdPattern,
     enableExternalStories,
-    belowFoldImgMargin,
   }
 ) {
   const url = urlLib.parse(req.url, true);
@@ -485,10 +481,8 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
     }
     const seoInstance = getSeoInstance(seo, config, result.pageType);
     const seoTags = seoInstance && seoInstance.getMetaTags(config, result.pageType || match.pageType, result, { url });
-
     const store = createStoreFromResult(url, result, {
       disableIsomorphicComponent: statusCode != 200,
-      belowFoldImgMargin,
     });
 
     if (lightPages) {

package/server/redirect-url-helper.js

@@ -1,73 +1,77 @@
-const url = require("url");
-const logError = require("./logger").error;
-const { match, compile } = require("path-to-regexp");
+const url = require('url')
+const logError = require('./logger').error
+const { match, compile } = require('path-to-regexp')
 
-function isUrl(url) {
+function isUrl (url) {
   try {
-    return new URL(url);
+    return new URL(url)
   } catch (err) {
-    return false;
+    return false
   }
 }
 
-function processRedirects(req, res, next, sourceUrlArray, urls) {
-  const query = url.parse(req.url, true) || {};
-  const search = query.search || "";
+function processRedirects (req, res, next, sourceUrlArray, urls) {
+  const query = url.parse(req.url, true) || {}
+  const search = query.search || ''
 
-  sourceUrlArray.some((sourceUrl) => {
+  sourceUrlArray.some(sourceUrl => {
     try {
+      const statusCode = parseInt(urls[sourceUrl].statusCode, 10)
+      if (statusCode === 410) {
+        res.sendStatus(410)
+        return true
+      }
       if (urls[sourceUrl]) {
-        const destinationPath = urls[sourceUrl].destinationUrl;
+        const destinationPath = urls[sourceUrl].destinationUrl
         const extractedSourceUrl = match(sourceUrl, {
-          decode: decodeURIComponent,
-        });
-        const destinationUrl = isUrl(destinationPath);
+          decode: decodeURIComponent
+        })
+        const destinationUrl = isUrl(destinationPath)
         if (extractedSourceUrl) {
-          let extractedDestinationUrl;
+          let extractedDestinationUrl
           if (destinationUrl) {
             extractedDestinationUrl = compile(destinationUrl.pathname, {
-              encode: encodeURIComponent,
-            });
+              encode: encodeURIComponent
+            })
           } else {
             extractedDestinationUrl = compile(destinationPath, {
-              encode: encodeURIComponent,
-            });
+              encode: encodeURIComponent
+            })
           }
-          const dynamicKeys = extractedSourceUrl(req.path);
-          const compiledPath = dynamicKeys && extractedDestinationUrl(dynamicKeys.params);
+          const dynamicKeys = extractedSourceUrl(req.path)
+          const compiledPath = dynamicKeys && extractedDestinationUrl(dynamicKeys.params)
           if (compiledPath) {
-            const validStatusCodes = { 301: "max-age=604800", 302: "max-age=86400" };
-            const statusCode = parseInt(urls[sourceUrl].statusCode, 10);
-            const cacheValue = validStatusCodes[statusCode];
+            const validStatusCodes = { 301: 'max-age=604800', 302: 'max-age=86400' }
+            const cacheValue = validStatusCodes[statusCode]
             if (cacheValue) {
-              res.set("cache-control", `public,${cacheValue}`);
+              res.set('cache-control', `public,${cacheValue}`)
             }
             res.redirect(
               statusCode,
               destinationUrl
                 ? `${destinationUrl.protocol}//${destinationUrl.hostname}${compiledPath}${search}`
                 : `${compiledPath}${search}`
-            );
-            return true;
+            )
+            return true
           }
         }
       }
     } catch (err) {
-      console.log(`Redirection error on ${req.host}-----`, err);
+      console.log(`Redirection error on ${req.host}-----`, err)
     }
-  });
+  })
 }
 
-exports.getRedirectUrl = async function getRedirectUrl(req, res, next, { redirectUrls, config }) {
-  let sourceUrls;
-  if (typeof redirectUrls === "function") {
-    const redirectUrlsList = await redirectUrls(config);
-    sourceUrls = Object.keys(redirectUrlsList);
+exports.getRedirectUrl = async function getRedirectUrl (req, res, next, { redirectUrls, config }) {
+  let sourceUrls
+  if (typeof redirectUrls === 'function') {
+    const redirectUrlsList = await redirectUrls(config)
+    sourceUrls = Object.keys(redirectUrlsList)
     if (sourceUrls.length > 0) {
-      processRedirects(req, res, next, sourceUrls, redirectUrlsList);
+      processRedirects(req, res, next, sourceUrls, redirectUrlsList)
     }
   } else if (redirectUrls) {
-    sourceUrls = Object.keys(redirectUrls);
-    sourceUrls.length > 0 && processRedirects(req, res, next, sourceUrls, redirectUrls);
+    sourceUrls = Object.keys(redirectUrls)
+    sourceUrls.length > 0 && processRedirects(req, res, next, sourceUrls, redirectUrls)
   }
-};
+}

package/server/routes.js

@@ -355,7 +355,6 @@ exports.isomorphicRoutes = function isomorphicRoutes(
     webengageConfig = {},
     externalIdPattern = "",
     enableExternalStories = false,
-    belowFoldImgMargin,
   }
 ) {
   const withConfig = withConfigPartial(getClient, logError, publisherConfig, configWrapper);
@@ -548,7 +547,6 @@ exports.isomorphicRoutes = function isomorphicRoutes(
       ampPageBasePath,
       externalIdPattern,
       enableExternalStories,
-      belowFoldImgMargin,
     })
   );