@quintype/framework 7.0.4-fcm-madrid.0 → 7.1.1-socket-timeout.2

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.1.0](https://github.com/quintype/quintype-node-framework/compare/v7.0.3...v7.1.0) (2022-02-11)
+
+
+### Features
+
+* **Custom Layout:** support custom storylimit and custom nestedCollectionLimit ([#288](https://github.com/quintype/quintype-node-framework/issues/288)) ([1e3e8ae](https://github.com/quintype/quintype-node-framework/commit/1e3e8ae7c7da2e336260911cf41f56c5419e9480))
+
 ### [7.0.3](https://github.com/quintype/quintype-node-framework/compare/v7.0.2...v7.0.3) (2022-02-01)
 
 ### [7.0.2](https://github.com/quintype/quintype-node-framework/compare/v7.0.1...v7.0.2) (2022-01-05)

package/client/start.js

@@ -7,7 +7,12 @@
  * @module start
  */
 
-import { BreakingNews, CLIENT_SIDE_RENDERED, NAVIGATE_TO_PAGE, PAGE_LOADING } from "@quintype/components";
+import {
+  BreakingNews,
+  CLIENT_SIDE_RENDERED,
+  NAVIGATE_TO_PAGE,
+  PAGE_LOADING
+} from "@quintype/components";
 import { createBrowserHistory } from "history";
 import get from "lodash/get";
 import React from "react";
@@ -16,12 +21,17 @@ import { Provider } from "react-redux";
 import { IsomorphicComponent } from "../isomorphic/component";
 import { makePickComponentSync } from "../isomorphic/impl/make-pick-component-sync";
 import { createQtStore } from "../store/create-store";
-import { registerPageView, registerStoryShare, setMemberId, startAnalytics } from "./analytics";
+import {
+  registerPageView,
+  registerStoryShare,
+  setMemberId,
+  startAnalytics
+} from "./analytics";
 import { initializeFCM } from "./impl/fcm";
 import {
   checkForServiceWorkerUpdates,
   registerServiceWorker,
-  setupServiceWorkerUpdates,
+  setupServiceWorkerUpdates
 } from "./impl/load-service-worker";
 
 require("../assetify/client")();
@@ -45,20 +55,28 @@ export const app = {
 };
 
 function getRouteDataAndPath(path, mountAt) {
-  const relativePath = path.startsWith(mountAt) ? path.slice(mountAt.length) : path;
+  const relativePath = path.startsWith(mountAt)
+    ? path.slice(mountAt.length)
+    : path;
   return [`${mountAt || ""}/route-data.json`, relativePath];
 }
 
-function getRouteData(path, { location = global.location, existingFetch, mountAt = global.qtMountAt }) {
+function getRouteData(
+  path,
+  { location = global.location, existingFetch, mountAt = global.qtMountAt }
+) {
   // if mountAt is set, then hit /mountAt/route-data, remove mountAt from path
 
   const [routeDataPath, relativePath] = getRouteDataAndPath(path, mountAt);
   const url = new URL(relativePath, location.origin);
   return (
     existingFetch ||
-    fetch(`${routeDataPath}?path=${encodeURIComponent(url.pathname)}${url.search ? `&${url.search.slice(1)}` : ""}`, {
-      credentials: "same-origin",
-    })
+    fetch(
+      `${routeDataPath}?path=${encodeURIComponent(url.pathname)}${
+        url.search ? `&${url.search.slice(1)}` : ""
+      }`,
+      { credentials: "same-origin" }
+    )
   )
     .then((response) => {
       if (response.status == 404) {
@@ -81,7 +99,11 @@ function getRouteData(path, { location = global.location, existingFetch, mountAt
   }
 
   function maybeBypassServiceWorker(e) {
-    if (global.qtLoadedFromShell || `${location.pathname}${location.search}${location.hash}` != `${path}#bypass-sw`) {
+    if (
+      global.qtLoadedFromShell ||
+      `${location.pathname}${location.search}${location.hash}` !=
+        `${path}#bypass-sw`
+    ) {
       location.href = `${path}#bypass-sw`;
       location.reload();
     }
@@ -102,7 +124,8 @@ let pickComponentWrapper = null;
  * @returns {void}
  */
 export function navigateToPage(dispatch, path, doNotPushPath) {
-  const pathname = !path || path === "undefined" ? global.location.pathname : path;
+  const pathname =
+    !path || path === "undefined" ? global.location.pathname : path;
 
   if (global.disableAjaxNavigation) {
     global.location = pathname;
@@ -111,7 +134,8 @@ export function navigateToPage(dispatch, path, doNotPushPath) {
   dispatch({ type: PAGE_LOADING });
   getRouteData(pathname, {}).then((page) => {
     if (!page) {
-      console && console.log("Recieved a null page. Expecting the browser to redirect.");
+      console &&
+        console.log("Recieved a null page. Expecting the browser to redirect.");
       return;
     }
 
@@ -123,7 +147,8 @@ export function navigateToPage(dispatch, path, doNotPushPath) {
     }
 
     Promise.resolve(
-      pickComponentWrapper && pickComponentWrapper.preloadComponent(page.pageType, page.subPageType)
+      pickComponentWrapper &&
+        pickComponentWrapper.preloadComponent(page.pageType, page.subPageType)
     ).then(() => {
       dispatch({
         type: NAVIGATE_TO_PAGE,
@@ -152,7 +177,8 @@ export function navigateToPage(dispatch, path, doNotPushPath) {
  * @returns {void}
  */
 export function maybeNavigateTo(path, store) {
-  if (store.getState().qt.currentPath != path) navigateToPage(store.dispatch, path, true);
+  if (store.getState().qt.currentPath != path)
+    navigateToPage(store.dispatch, path, true);
 }
 
 /**
@@ -179,12 +205,24 @@ export function maybeSetUrl(path, title) {
  * @param {callback} callback Callback on completion
  */
 export function renderComponent(clazz, container, store, props = {}, callback) {
-  const component = React.createElement(Provider, { store }, React.createElement(clazz, props || {}));
+  const component = React.createElement(
+    Provider,
+    { store },
+    React.createElement(clazz, props || {})
+  );
 
   if (props.hydrate) {
-    return ReactDOM.hydrate(component, document.getElementById(container), callback);
+    return ReactDOM.hydrate(
+      component,
+      document.getElementById(container),
+      callback
+    );
   }
-  return ReactDOM.render(component, document.getElementById(container), callback);
+  return ReactDOM.render(
+    component,
+    document.getElementById(container),
+    callback
+  );
 }
 
 /**
@@ -195,11 +233,19 @@ export function renderComponent(clazz, container, store, props = {}, callback) {
  * @param {Object} props Properties to bootstrap the component with
  * @param {boolean} props.hydrate Hydrate the component instead of rendering it
  */
-export function renderIsomorphicComponent(container, store, pickComponent, props) {
+export function renderIsomorphicComponent(
+  container,
+  store,
+  pickComponent,
+  props
+) {
   if (!store.getState().qt.disableIsomorphicComponent) {
     pickComponentWrapper = makePickComponentSync(pickComponent);
     return pickComponentWrapper
-      .preloadComponent(store.getState().qt.pageType, store.getState().qt.subPageType)
+      .preloadComponent(
+        store.getState().qt.pageType,
+        store.getState().qt.subPageType
+      )
       .then(() =>
         renderComponent(
           IsomorphicComponent,
@@ -221,7 +267,12 @@ export function renderIsomorphicComponent(container, store, pickComponent, props
  * @param {Object} props Properties to bootstrap the component with
  */
 export function renderBreakingNews(container, store, view, props) {
-  return renderComponent(BreakingNews, container, store, Object.assign({ view }, props));
+  return renderComponent(
+    BreakingNews,
+    container,
+    store,
+    Object.assign({ view }, props)
+  );
 }
 
 function getJsonContent(id) {
@@ -255,7 +306,8 @@ export function startApp(renderApplication, reducers, opts) {
   global.app = app;
   const { location } = global;
   const path = `${location.pathname}${location.search || ""}`;
-  const staticData = global.staticPageStoreContent || getJsonContent("static-page");
+  const staticData =
+    global.staticPageStoreContent || getJsonContent("static-page");
   const dataPromise = staticData
     ? Promise.resolve(staticData.qt)
     : getRouteData(path, { existingFetch: global.initialFetch });
@@ -264,7 +316,10 @@ export function startApp(renderApplication, reducers, opts) {
 
   const store = createQtStore(
     reducers,
-    (staticData && staticData.qt) || global.initialPage || getJsonContent("initial-page") || {},
+    (staticData && staticData.qt) ||
+      global.initialPage ||
+      getJsonContent("initial-page") ||
+      {},
     {}
   );
 
@@ -276,33 +331,29 @@ export function startApp(renderApplication, reducers, opts) {
 
   function doStartApp(page, opts) {
     if (!page) {
-      console && console.log("Received a null page. Expecting the browser to redirect.");
+      console &&
+        console.log("Received a null page. Expecting the browser to redirect.");
       return;
     }
 
     store.dispatch({ type: NAVIGATE_TO_PAGE, page, currentPath: path });
-
-    const pbGeneralConfig = get(page, ["config", "pagebuilder-config", "general"], {});
-
-    if (opts.enableFCM || get(pbGeneralConfig, ["notificationType"], "") === "fcm") {
-      const mssgSenderId = get(
-        pbGeneralConfig,
-        ["notifications", "fcm", "messagingSenderId"],
-        get(page, ["config", "fcmMessageSenderId"], null)
-      );
+    if (opts.enableFCM) {
+      const mssgSenderId = get(page, ["config", "fcmMessageSenderId"], null);
       initializeFCM(mssgSenderId);
     }
 
     const { config: { "theme-attributes": pageThemeAttributes = {} } = {} } = page;
     const version = pageThemeAttributes["cache-burst"] || app.getAppVersion();
 
-    const serviceWorkerPromise = registerServiceWorker({ ...opts, version });
+    const serviceWorkerPromise = registerServiceWorker({...opts, version});
 
     setupServiceWorkerUpdates(serviceWorkerPromise, app, store, page, opts);
 
     runWithTiming("qt_render", () => renderApplication(store));
 
-    history.listen((change) => app.maybeNavigateTo(`${change.pathname}${change.search || ""}`, store));
+    history.listen((change) =>
+      app.maybeNavigateTo(`${change.pathname}${change.search || ""}`, store)
+    );
 
     registerPageView(store.getState().qt);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.0.4-fcm-madrid.0",
+  "version": "7.1.1-socket-timeout.2",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
   "dependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
     "@quintype/amp": "^2.4.19",
-    "@quintype/backend": "^2.1.0",
+    "@quintype/backend": "^2.2.1-socket-timeout.0",
     "@quintype/components": "^3.0.0",
     "@quintype/prerender-node": "^3.2.24",
     "@quintype/seo": "^1.38.1",
@@ -38,7 +38,7 @@
     "compression": "^1.7.4",
     "ejs": "^3.1.6",
     "express": "^4.17.1",
-    "firebase": "^6.0.2",
+    "firebase": "^9.1.1",
     "get-youtube-id": "^1.0.1",
     "grpc": "^1.21.1",
     "http-proxy": "^1.18.1",

package/server/data-loader-helpers.js

@@ -19,13 +19,21 @@ exports.homeCollectionOrStories = function homeCollectionOrStories(
   depth = 1,
   getStoryLimits,
   params = {},
-  collectionOfCollectionsIndexes = []
+  collectionOfCollectionsIndexes = [],
+  customLayouts = [],
+  defaultNestedLimit = null
 ) {
   return Collection.getCollectionBySlug(
     client,
     "home",
     { "item-type": "collection", ...params },
-    { depth, ...(getStoryLimits && { storyLimits: getStoryLimits() }), collectionOfCollectionsIndexes }
+    {
+      depth,
+      ...(getStoryLimits && { storyLimits: getStoryLimits() }),
+      collectionOfCollectionsIndexes,
+      customLayouts,
+      defaultNestedLimit,
+    }
   ).then((collection) => {
     if (collection) return collection;
     return Story.getStories(client).then((stories) =>

package/server/handlers/fcm-registration-handler.js

@@ -1,18 +1,19 @@
 const { get } = require("lodash");
 const request = require("request-promise");
 
-exports.registerFCMTopic = async function registerFCM(req, res, next, { config, client, publisherConfig }) {
+exports.registerFCMTopic = async function registerFCM(
+  req,
+  res,
+  next,
+  { config, client, publisherConfig }
+) {
   const token = get(req, ["body", "token"], null);
   if (!token) {
     res.status(400).send("No Token Found");
     return;
   }
 
-  const serverKey = get(
-    config,
-    ["pbConfig", "general", "notifications", "fcm", "serverKey"],
-    get(publisherConfig, ["fcm", "serverKey"], null)
-  );
+  const serverKey = get(publisherConfig, ["fcm", "serverKey"], null);
   if (!serverKey) {
     res.status(500).send("Server Key is not available");
     return;

package/server/handlers/isomorphic-handler.js

@@ -26,7 +26,7 @@ function loadDataForIsomorphicRoute(
   loadErrorData,
   url,
   routes,
-  { otherParams, config, client, host, logError, domainSlug, redirectToLowercaseSlugs, cookies }
+  { otherParams, config, client, host, logError, domainSlug, redirectToLowercaseSlugs, cookies, mobileApiEnabled }
 ) {
   return loadDataForEachRoute().catch((error) => {
     logError(error);
@@ -61,6 +61,7 @@ function loadDataForIsomorphicRoute(
         next: abortHandler,
         domainSlug,
         cookies,
+        mobileApiEnabled,
       });
 
       if (result && result[ABORT_HANDLER]) continue;
@@ -253,6 +254,7 @@ exports.handleIsomorphicDataLoad = function handleIsomorphicDataLoad(
         logError,
         host: req.hostname,
         domainSlug,
+        mobileApiEnabled,
       }).then((result) => Object.assign({ pageType, disableIsomorphicComponent: true }, result));
     }
   }
@@ -275,6 +277,7 @@ exports.handleIsomorphicDataLoad = function handleIsomorphicDataLoad(
       domainSlug,
       redirectToLowercaseSlugs,
       cookies: req.cookies,
+      mobileApiEnabled,
     }).catch((e) => {
       logError(e);
       return { httpStatusCode: 500, pageType: "error" };

package/server/start.js

@@ -16,6 +16,7 @@ const process = require("process");
 const { initializeAllClients } = require("./api-client");
 const logger = require("./logger");
 const logSuccess = chalk.bold.cyanBright;
+const http = require('http');
 
 function startMaster({ workers = 4 }) {
   let terminating = false;
@@ -53,7 +54,7 @@ function startMaster({ workers = 4 }) {
     );
 
     if (terminating) {
-      if (aliveWorkers.length == 0) {
+      if (aliveWorkers.length === 0) {
         logger.info("All Workers Terminated. Gracefully Exiting");
         process.exit();
       }
@@ -73,12 +74,19 @@ async function startWorker(appThunk, opts) {
     const app = appThunk();
 
     await initializeAllClients();
-    const server = app.listen(opts.port || 3000, () => {
+    const server = http.createServer(app).listen(opts.port || 3000, () => {
       console.log(logSuccess(`||=============================||`));
-      console.log(logSuccess(`|| App listening on port ${opts.port || 3000}! ||`))
+      console.log(logSuccess(`|| App listening on port ${opts.port || 3000}! ||`));
       console.log(logSuccess(`||=============================||`));
     });
 
+    server.setTimeout(opts.socketTimeout || 2000,()=>{
+      console.log("Socket is destroyed due to timeout");
+      server.close(()=>{
+        console.log("Server is closed");
+      })
+    })
+
     process.on("SIGTERM", () => {
       server.close(() => {
         cluster.worker.disconnect();