@quintype/framework 7.26.1 → 7.26.2-amp-infinite-scroll-errors.0

package/bin-dev-scripts/standard-version-release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-npm install --legacy-peer-deps
+npm install
 git diff --quiet
 npm run docs
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.26.1",
+  "version": "7.26.2-amp-infinite-scroll-errors.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -8,7 +8,7 @@
     "npm": "^8.5.0"
   },
   "scripts": {
-    "prepublishOnly": "npm test && ./bin-dev-scripts/standard-version-release.sh",
+    "prepublishOnly": "./bin-dev-scripts/standard-version-release.sh",
     "test": "NODE_ENV=test npx mocha --recursive --require ./test/babel",
     "watch-test": "NODE_ENV=test npx mocha --recursive --watch --require ./test/babel",
     "coverage": "nyc --all npm test",

package/server/amp/handlers/infinite-scroll.js

@@ -20,11 +20,19 @@ async function storyPageInfiniteScrollHandler(req, res, next, { client, config,
     infiniteScrollSource,
   });
   const jsonResponse = await infiniteScrollAmp.getResponse();
-  if (jsonResponse instanceof Error) return next(jsonResponse);
+  if (jsonResponse instanceof Error) return handleErrorResponse(res, next, jsonResponse);
   res.set("Content-Type", "application/json; charset=utf-8");
   setCorsHeaders({ req, res, next, publisherConfig: config });
 
   if (!res.headersSent) return res.send(jsonResponse);
 }
 
+function handleErrorResponse(res, next, error) {
+  const errorMessage = error.message;
+  if (errorMessage === `Query param "story-id" missing`) {
+    return res.status(400).send(errorMessage);
+  }
+  return next(errorMessage);
+}
+
 module.exports = { storyPageInfiniteScrollHandler };

package/server/redirect-url-helper.js

@@ -13,10 +13,11 @@ function isUrl(url) {
 function processRedirects(req, res, next, sourceUrlArray, urls) {
   const query = url.parse(req.url, true) || {};
   const search = query.search || "";
+  if (!urls || !sourceUrlArray || !Array.isArray(urls) || !Array.isArray(sourceUrlArray)) return;
 
   sourceUrlArray.some((sourceUrl) => {
-    try {
-      if (urls[sourceUrl]) {
+    if (urls[sourceUrl]) {
+      try {
         const destinationPath = urls[sourceUrl].destinationUrl;
         const extractedSourceUrl = match(sourceUrl, {
           decode: decodeURIComponent,
@@ -51,9 +52,9 @@ function processRedirects(req, res, next, sourceUrlArray, urls) {
             return true;
           }
         }
+      } catch (err) {
+        console.log(`Redirection error on host: '${req.host}' url: '${sourceUrl}'`, err);
       }
-    } catch (err) {
-      console.log(`Redirection error on ${req.host}-----`, err);
     }
   });
 }