@quintype/framework 7.33.1-qttracelogs.3 → 7.33.1

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.33.1](https://github.com/quintype/quintype-node-framework/compare/v7.33.0...v7.33.1) (2025-01-20)
+
+
+### Bug Fixes
+
+* **Static routes:** support 404 if no loader ([#452](https://github.com/quintype/quintype-node-framework/issues/452)) ([735b778](https://github.com/quintype/quintype-node-framework/commit/735b77887ae0359b85fde8db1a203f7576244a3b))
+
 ## [7.33.0](https://github.com/quintype/quintype-node-framework/compare/v7.32.0...v7.33.0) (2024-12-10)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.33.1-qttracelogs.3",
+  "version": "7.33.1",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -31,9 +31,8 @@
   "homepage": "https://github.com/quintype/quintype-node-framework#readme",
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
-    "@jsdoc/salty": "^0.2.9",
     "@quintype/amp": "^2.20.0",
-    "@quintype/backend": "^2.7.2-qttracelogs.6",
+    "@quintype/backend": "^2.7.0",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",
     "@quintype/seo": "^1.46.1",
@@ -60,7 +59,6 @@
     "redux": "^4.1.1",
     "request-promise": "^4.2.6",
     "sleep-promise": "^9.1.0",
-    "uuid": "^11.0.5",
     "winston": "3.3.3"
   },
   "devDependencies": {
@@ -75,7 +73,7 @@
     "babel-preset-es2015-tree-shaking": "^1.0.1",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
-    "better-docs": "^2.7.3",
+    "better-docs": "^2.3.2",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.3",

package/server/handlers/isomorphic-handler.js

@@ -123,8 +123,10 @@ function loadDataForPageType(
     )
   )
     .then((result) => {
-      if (result && result.data && result.data[ABORT_HANDLER]) {
-        return null;
+      if (result && result.data) {
+        if (result.data[ABORT_HANDLER] || (result.data.error && result.data.error.message)) {
+          return null
+        }
       }
       return result;
     })

package/server/routes.js

@@ -29,7 +29,6 @@ const bodyParser = require('body-parser')
 const get = require('lodash/get')
 const { URL } = require('url')
 const prerender = require('@quintype/prerender-node')
-const { v4: uuidv4 } = require('uuid');
 
 /**
  * *upstreamQuintypeRoutes* connects various routes directly to the upstream API server.
@@ -44,7 +43,7 @@ const { v4: uuidv4 } = require('uuid');
  * @param {boolean} opts.forwardFavicon Forward favicon requests to the CMS (default false)
  * @param {boolean} opts.isSitemapUrlEnabled To enable /news_sitemap/today and /news_sitemap/yesterday sitemap news url (default /news_sitemap.xml)
  */
-exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
+exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes (
   app,
   {
     forwardAmp = false,
@@ -65,14 +64,7 @@ exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
   })
 
   apiProxy.on('proxyReq', (proxyReq, req, res, options) => {
-    console.log("INSIDE PROXY", req.originalUrl);
-    console.log("GENERTATING QT TRACE ID API PROXY FROM HEADERS", (req && req.headers && req.headers['qt-trace-id']));
-
-    const qtTraceId = (req && req.headers && req.headers['qt-trace-id']) || uuidv4();
-
-    console.log("GENERTATING QT TRACE ID API PROXY", qtTraceId);
     proxyReq.setHeader('Host', getClient(req.hostname).getHostname())
-    proxyReq.setHeader('qt-trace-id', qtTraceId)
   })
 
   const _sMaxAge = get(config, ['publisher', 'upstreamRoutesSmaxage'], sMaxAge)
@@ -103,15 +95,7 @@ exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
       }
     })
 
-  const sketchesProxy = (req, res) => {
-    // Attach QT-TRACE-ID to all the request going to sketches.
-    console.log("INSIDE SKETCHES PROXY", req.originalUrl);
-    console.log("INSIDE SKETCHES PROXY QT TRACE ID FROM HEADERS", (req && req.headers && req.headers['qt-trace-id']))
-    const qtTraceId = (req && req.headers && req.headers['qt-trace-id']) || uuidv4();
-    console.log("INSIDE SKETCHES PROXY GENERATING QT TRACE ID", qtTraceId)
-    req.headers['qt-trace-id'] = qtTraceId;
-    return apiProxy.web(req, res);
-  };
+  const sketchesProxy = (req, res) => apiProxy.web(req, res)
 
   app.get('/ping', (req, res) => {
     getClient(req.hostname)
@@ -162,12 +146,12 @@ exports.upstreamQuintypeRoutes = function upstreamQuintypeRoutes(
 }
 
 // istanbul ignore next
-function renderServiceWorkerFn(res, layout, params, callback) {
+function renderServiceWorkerFn (res, layout, params, callback) {
   return res.render(layout, params, callback)
 }
 
 // istanbul ignore next
-function toFunction(value, toRequire) {
+function toFunction (value, toRequire) {
   if (value === true) {
     value = require(toRequire)
   }
@@ -178,20 +162,20 @@ function toFunction(value, toRequire) {
   return () => value
 }
 
-function getDomainSlug(publisherConfig, hostName) {
+function getDomainSlug (publisherConfig, hostName) {
   if (!publisherConfig.domain_mapping) {
     return undefined
   }
   return publisherConfig.domain_mapping[hostName] || null
 }
 
-function withConfigPartial(
+function withConfigPartial (
   getClient,
   logError,
   publisherConfig = require('./publisher-config'),
   configWrapper = config => config
 ) {
-  return function withConfig(f, staticParams) {
+  return function withConfig (f, staticParams) {
     return function (req, res, next) {
       const domainSlug = getDomainSlug(publisherConfig, req.hostname)
       const client = getClient(req.hostname)
@@ -215,7 +199,7 @@ function withConfigPartial(
   }
 }
 
-exports.withError = function withError(handler, logError) {
+exports.withError = function withError (handler, logError) {
   return async (req, res, next, opts) => {
     try {
       await handler(req, res, next, opts)
@@ -227,15 +211,15 @@ exports.withError = function withError(handler, logError) {
   }
 }
 
-function convertToDomain(path) {
+function convertToDomain (path) {
   if (!path) {
     return path
   }
   return new URL(path).origin
 }
 
-function wrapLoadDataWithMultiDomain(publisherConfig, f, configPos) {
-  return async function loadDataWrapped() {
+function wrapLoadDataWithMultiDomain (publisherConfig, f, configPos) {
+  return async function loadDataWrapped () {
     const { domainSlug } = arguments[arguments.length - 1]
     const config = arguments[configPos]
     const primaryHostUrl = convertToDomain(config['sketches-host'])
@@ -273,7 +257,7 @@ function wrapLoadDataWithMultiDomain(publisherConfig, f, configPos) {
  * @param {module:routes~Handler} handler The Handler to run
  * @param {Object} opts Options that will be passed to the handler. These options will be merged with a *config* and *client*
  */
-function getWithConfig(app, route, handler, opts = {}) {
+function getWithConfig (app, route, handler, opts = {}) {
   const configWrapper = opts.configWrapper
   const {
     getClient = require('./api-client').getClient,
@@ -325,7 +309,7 @@ function getWithConfig(app, route, handler, opts = {}) {
  * @param {boolean|function} enableExternalStories If set to true, then for every request an external story api call is made and renders the story-page if the story is found. (default: false)
  * @param {string|function} externalIdPattern This string specifies the external id pattern the in the url. Mention `EXTERNAL_ID` to specify the position of external id in the url. Ex: "/parent-section/child-section/EXTERNAL_ID"
  */
-exports.isomorphicRoutes = function isomorphicRoutes(
+exports.isomorphicRoutes = function isomorphicRoutes (
   app,
   {
     generateRoutes,
@@ -640,13 +624,12 @@ exports.getWithConfig = getWithConfig
  * @param opts.cacheControl The cache control header to set on proxied requests (default: *"public,max-age=15,s-maxage=240,stale-while-revalidate=300,stale-if-error=3600"*)
  */
 exports.proxyGetRequest = function (app, route, handler, opts = {}) {
-
   const { logError = require('./logger').error } = opts
   const { cacheControl = 'public,max-age=15,s-maxage=240,stale-while-revalidate=300,stale-if-error=3600' } = opts
 
   getWithConfig(app, route, proxyHandler, opts)
 
-  async function proxyHandler(req, res, next, { config, client }) {
+  async function proxyHandler (req, res, next, { config, client }) {
     try {
       const result = await handler(req.params, { config, client })
       if (typeof result === 'string' && result.startsWith('http')) {
@@ -659,7 +642,7 @@ exports.proxyGetRequest = function (app, route, handler, opts = {}) {
       sendResult(null)
     }
 
-    function sendResult(result) {
+    function sendResult (result) {
       if (result) {
         res.setHeader('Cache-Control', cacheControl)
         res.setHeader('Vary', 'Accept-Encoding')